Browse Source

11.12代码提交

“lqy 1 month ago
parent
commit
31dfcb5495
25 changed files with 43 additions and 341 deletions
  1. 2 2
      mjava-huagao/src/main/java/com/malk/huagao/controller/KdYdCustomerController.java
  2. 0 18
      mjava-huagao/src/main/java/com/malk/huagao/controller/KdYdDeliveryDetailController.java
  3. 0 18
      mjava-huagao/src/main/java/com/malk/huagao/controller/KdYdOrderDetailController.java
  4. 0 18
      mjava-huagao/src/main/java/com/malk/huagao/controller/KdYdOutboundDetailController.java
  5. 0 18
      mjava-huagao/src/main/java/com/malk/huagao/controller/KdYdReceivableDetailController.java
  6. 0 18
      mjava-huagao/src/main/java/com/malk/huagao/controller/KdYdZpDetailController.java
  7. 0 16
      mjava-huagao/src/main/java/com/malk/huagao/service/IKdYdDeliveryDetailService.java
  8. 0 16
      mjava-huagao/src/main/java/com/malk/huagao/service/IKdYdOrderDetailService.java
  9. 0 16
      mjava-huagao/src/main/java/com/malk/huagao/service/IKdYdOutboundDetailService.java
  10. 0 16
      mjava-huagao/src/main/java/com/malk/huagao/service/IKdYdReceivableDetailService.java
  11. 0 16
      mjava-huagao/src/main/java/com/malk/huagao/service/IKdYdZpDetailService.java
  12. 5 7
      mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdCustomerLiaisonServiceImpl.java
  13. 5 7
      mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdCustomerReferrerServiceImpl.java
  14. 3 6
      mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdCustomerServiceImpl.java
  15. 0 20
      mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdDeliveryDetailServiceImpl.java
  16. 8 14
      mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdDeliveryServiceImpl.java
  17. 2 2
      mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdMaterialServiceImpl.java
  18. 0 20
      mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdOrderDetailServiceImpl.java
  19. 10 19
      mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdOrderServiceImpl.java
  20. 0 20
      mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdOutboundDetailServiceImpl.java
  21. 0 20
      mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdReceivableDetailServiceImpl.java
  22. 0 20
      mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdZpDetailServiceImpl.java
  23. 4 10
      mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdZpServiceImpl.java
  24. 3 3
      mjava-huagao/src/main/java/com/malk/huagao/service/impl/YdHuaGaoServiceImpl.java
  25. 1 1
      mjava-huagao/src/main/java/com/malk/huagao/utils/MPGenerator.java

+ 2 - 2
mjava-huagao/src/main/java/com/malk/huagao/controller/KdYdCustomerController.java

@@ -51,11 +51,11 @@ private YDClient ydClient;
 ////                .updateFormDataJson(JSONObject.toJSONString(UtilMap.map(employ,id)))//xz04
 //                .useLatestVersion(true)
 //                .build(), YDConf.FORM_OPERATION.update);
-//        ydHuaGaoService.synckdYdMaterial();
+        ydHuaGaoService.synckdYdMaterial();
 //        ydHuaGaoService.synckdYdPayment();
 //        ydHuaGaoService.syncKdYdReceivable();
 //        kdYdZpService.insertkdYdZp(data);
-        ydHuaGaoService.synckdYdOutbound();
+//        ydHuaGaoService.synckdYdOutbound();
         return McR.success();
     }
     @PostMapping("/kdYdCustomer")

+ 0 - 18
mjava-huagao/src/main/java/com/malk/huagao/controller/KdYdDeliveryDetailController.java

@@ -1,18 +0,0 @@
-package com.malk.huagao.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author LQY
- * @since 2025-10-15
- */
-@Controller
-@RequestMapping("//kdYdDeliveryDetail")
-public class KdYdDeliveryDetailController {
-
-}

+ 0 - 18
mjava-huagao/src/main/java/com/malk/huagao/controller/KdYdOrderDetailController.java

@@ -1,18 +0,0 @@
-package com.malk.huagao.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author LQY
- * @since 2025-10-15
- */
-@Controller
-@RequestMapping("//kdYdOrderDetail")
-public class KdYdOrderDetailController {
-
-}

+ 0 - 18
mjava-huagao/src/main/java/com/malk/huagao/controller/KdYdOutboundDetailController.java

@@ -1,18 +0,0 @@
-package com.malk.huagao.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author LQY
- * @since 2025-10-15
- */
-@Controller
-@RequestMapping("//kdYdOutboundDetail")
-public class KdYdOutboundDetailController {
-
-}

+ 0 - 18
mjava-huagao/src/main/java/com/malk/huagao/controller/KdYdReceivableDetailController.java

@@ -1,18 +0,0 @@
-package com.malk.huagao.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author LQY
- * @since 2025-10-16
- */
-@Controller
-@RequestMapping("//kdYdReceivableDetail")
-public class KdYdReceivableDetailController {
-
-}

+ 0 - 18
mjava-huagao/src/main/java/com/malk/huagao/controller/KdYdZpDetailController.java

@@ -1,18 +0,0 @@
-package com.malk.huagao.controller;
-
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.stereotype.Controller;
-
-/**
- * <p>
- *  前端控制器
- * </p>
- *
- * @author LQY
- * @since 2025-10-16
- */
-@Controller
-@RequestMapping("//kdYdZpDetail")
-public class KdYdZpDetailController {
-
-}

+ 0 - 16
mjava-huagao/src/main/java/com/malk/huagao/service/IKdYdDeliveryDetailService.java

@@ -1,16 +0,0 @@
-package com.malk.huagao.service;
-
-import com.malk.huagao.entity.KdYdDeliveryDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author LQY
- * @since 2025-10-15
- */
-public interface IKdYdDeliveryDetailService extends IService<KdYdDeliveryDetail> {
-
-}

+ 0 - 16
mjava-huagao/src/main/java/com/malk/huagao/service/IKdYdOrderDetailService.java

@@ -1,16 +0,0 @@
-package com.malk.huagao.service;
-
-import com.malk.huagao.entity.KdYdOrderDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author LQY
- * @since 2025-10-15
- */
-public interface IKdYdOrderDetailService extends IService<KdYdOrderDetail> {
-
-}

+ 0 - 16
mjava-huagao/src/main/java/com/malk/huagao/service/IKdYdOutboundDetailService.java

@@ -1,16 +0,0 @@
-package com.malk.huagao.service;
-
-import com.malk.huagao.entity.KdYdOutboundDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author LQY
- * @since 2025-10-15
- */
-public interface IKdYdOutboundDetailService extends IService<KdYdOutboundDetail> {
-
-}

+ 0 - 16
mjava-huagao/src/main/java/com/malk/huagao/service/IKdYdReceivableDetailService.java

@@ -1,16 +0,0 @@
-package com.malk.huagao.service;
-
-import com.malk.huagao.entity.KdYdReceivableDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author LQY
- * @since 2025-10-16
- */
-public interface IKdYdReceivableDetailService extends IService<KdYdReceivableDetail> {
-
-}

+ 0 - 16
mjava-huagao/src/main/java/com/malk/huagao/service/IKdYdZpDetailService.java

@@ -1,16 +0,0 @@
-package com.malk.huagao.service;
-
-import com.malk.huagao.entity.KdYdZpDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author LQY
- * @since 2025-10-16
- */
-public interface IKdYdZpDetailService extends IService<KdYdZpDetail> {
-
-}

+ 5 - 7
mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdCustomerLiaisonServiceImpl.java

@@ -75,13 +75,11 @@ public class KdYdCustomerLiaisonServiceImpl extends ServiceImpl<KdYdCustomerLiai
         kdYdCustomerLiaison.setCustomerId(id);
         kdYdCustomerLiaison.setSyncStatus("0");
         kdYdCustomerLiaison.setOperationType("1");
-        if (type.equals("2")) {
-            kdYdCustomerLiaison.setOperationType("2");
-            kdYdCustomerLiaisonMapper.update(kdYdCustomerLiaison, new LambdaQueryWrapper<KdYdCustomerLiaison>().eq(KdYdCustomerLiaison::getBm, bm));
-        }else if (type.equals("3")){
-            kdYdCustomerLiaison.setOperationType("3");
-            kdYdCustomerLiaisonMapper.update(kdYdCustomerLiaison, new LambdaQueryWrapper<KdYdCustomerLiaison>().eq(KdYdCustomerLiaison::getBm, bm));
-        }else {
+        if ("2".equals(type) || "3".equals(type)) {
+            kdYdCustomerLiaison.setOperationType(type);
+            kdYdCustomerLiaisonMapper.update(kdYdCustomerLiaison,
+                    new LambdaQueryWrapper<KdYdCustomerLiaison>().eq(KdYdCustomerLiaison::getBm, bm));
+        } else {
             this.save(kdYdCustomerLiaison);
         }
 //        ydClient.operateData(

+ 5 - 7
mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdCustomerReferrerServiceImpl.java

@@ -65,13 +65,11 @@ private KdYdCustomerReferrerMapper kdYdCustomerReferrerMapper;
         kdYdCustomerReferrer.setOperationType("1");
         kdYdCustomerReferrer.setFormInstId(formInstId);
 
-        if (type.equals("2")) {
-            kdYdCustomerReferrer.setOperationType("2");
-            kdYdCustomerReferrerMapper.update(kdYdCustomerReferrer, new LambdaQueryWrapper<KdYdCustomerReferrer>().eq(KdYdCustomerReferrer::getBm, bm));
-        }else if (type.equals("3")){
-            kdYdCustomerReferrer.setOperationType("3");
-            kdYdCustomerReferrerMapper.update(kdYdCustomerReferrer, new LambdaQueryWrapper<KdYdCustomerReferrer>().eq(KdYdCustomerReferrer::getBm, bm));
-        }else {
+        if ("2".equals(type) || "3".equals(type)) {
+            kdYdCustomerReferrer.setOperationType(type);
+            kdYdCustomerReferrerMapper.update(kdYdCustomerReferrer,
+                    new LambdaQueryWrapper<KdYdCustomerReferrer>().eq(KdYdCustomerReferrer::getBm, bm));
+        } else {
             this.save(kdYdCustomerReferrer);
         }
     }

+ 3 - 6
mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdCustomerServiceImpl.java

@@ -99,13 +99,10 @@ public class KdYdCustomerServiceImpl extends ServiceImpl<KdYdCustomerMapper, KdY
         kdYdCustomer.setTjruuid(tjruuid);
         kdYdCustomer.setSyncStatus("0");
         kdYdCustomer.setOperationType("1");
-        if (type.equals("2")) {
-            kdYdCustomer.setOperationType("2");
+        if ("2".equals(type) || "3".equals(type)) {
+            kdYdCustomer.setOperationType(type);
             kdYdCustomerMapper.update(kdYdCustomer, new LambdaQueryWrapper<KdYdCustomer>().eq(KdYdCustomer::getKhbm, khbm));
-        }else if (type.equals("3")){
-            kdYdCustomer.setOperationType("3");
-            kdYdCustomerMapper.update(kdYdCustomer, new LambdaQueryWrapper<KdYdCustomer>().eq(KdYdCustomer::getKhbm, khbm));
-        }else {
+        } else {
             this.save(kdYdCustomer);
         }
 

+ 0 - 20
mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdDeliveryDetailServiceImpl.java

@@ -1,20 +0,0 @@
-package com.malk.huagao.service.impl;
-
-import com.malk.huagao.entity.KdYdDeliveryDetail;
-import com.malk.huagao.mapper.KdYdDeliveryDetailMapper;
-import com.malk.huagao.service.IKdYdDeliveryDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author LQY
- * @since 2025-10-15
- */
-@Service
-public class KdYdDeliveryDetailServiceImpl extends ServiceImpl<KdYdDeliveryDetailMapper, KdYdDeliveryDetail> implements IKdYdDeliveryDetailService {
-
-}

+ 8 - 14
mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdDeliveryServiceImpl.java

@@ -98,13 +98,10 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
         kdYdDelivery.setKdgs(kdgs);
         kdYdDelivery.setFkfs(fkfs);
         kdYdDelivery.setForminstid(formInstId);
-        if (type.equals("2")) {
-            kdYdDelivery.setOperationType("2");
+        if ("2".equals(type) || "3".equals(type)) {
+            kdYdDelivery.setOperationType(type);
             kdYdDeliveryMapper.update(kdYdDelivery, new LambdaQueryWrapper<KdYdDelivery>().eq(KdYdDelivery::getDjbh, djbh));
-        }else if (type.equals("3")){
-            kdYdDelivery.setOperationType("3");
-            kdYdDeliveryMapper.update(kdYdDelivery, new LambdaQueryWrapper<KdYdDelivery>().eq(KdYdDelivery::getDjbh, djbh));
-        }else {
+        } else {
             kdYdDeliveryMapper.insert(kdYdDelivery);
         }
 
@@ -149,15 +146,12 @@ public class KdYdDeliveryServiceImpl extends ServiceImpl<KdYdDeliveryMapper, KdY
             kdYdDeliveryDetail.setZbq(zbq);
             kdYdDeliveryDetail.setKddh(kddh);
             kdYdDeliveryDetail.setMdh(mdh);
-            if (type.equals("2")) {
-                kdYdDeliveryDetail.setOperationType("2");
-                kdYdDeliveryDetailMapper.update(kdYdDeliveryDetail, new LambdaQueryWrapper<KdYdDeliveryDetail>().eq(KdYdDeliveryDetail::getWlbm, wlbm)
-                        .eq(KdYdDeliveryDetail::getDeliveryId, id));
-            }else if (type.equals("3")){
-                kdYdDeliveryDetail.setOperationType("3");
-                kdYdDeliveryDetailMapper.update(kdYdDeliveryDetail, new LambdaQueryWrapper<KdYdDeliveryDetail>().eq(KdYdDeliveryDetail::getWlbm, wlbm)
+            if ("2".equals(type) || "3".equals(type)) {
+                kdYdDeliveryDetail.setOperationType(type);
+                kdYdDeliveryDetailMapper.update(kdYdDeliveryDetail, new LambdaQueryWrapper<KdYdDeliveryDetail>()
+                        .eq(KdYdDeliveryDetail::getWlbm, wlbm)
                         .eq(KdYdDeliveryDetail::getDeliveryId, id));
-            }else {
+            } else {
                 kdYdDeliveryDetailMapper.insert(kdYdDeliveryDetail);
             }
 

+ 2 - 2
mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdMaterialServiceImpl.java

@@ -60,7 +60,7 @@ public class KdYdMaterialServiceImpl extends ServiceImpl<KdYdMaterialMapper, KdY
         String dzl = UtilMap.getString(formData, "textField_mfxbtcea");
         String pzzt = UtilMap.getString(formData, "selectField_mejl9nrq");
         String wlbt = wlmc+"-"+xh;
-        String sdmc = ssxl+"-"+pzzt+"-"+safeGetString(formData, "numberField_mfxbtceb");
+//        String sdmc = ssxl+"-"+pzzt+"-"+safeGetString(formData, "numberField_mfxbtceb");
 
         KdYdMaterial kdYdMaterial = new KdYdMaterial();
         kdYdMaterial.setWlmc(wlmc);
@@ -82,7 +82,7 @@ public class KdYdMaterialServiceImpl extends ServiceImpl<KdYdMaterialMapper, KdY
         kdYdMaterial.setDzl(dzl);
         kdYdMaterial.setPzzt(pzzt);
         kdYdMaterial.setMaterialtitle(wlbt);
-        kdYdMaterial.setSpeedname(sdmc);
+//        kdYdMaterial.setSpeedname(sdmc);
         kdYdMaterial.setForminstid(formInstId);
         kdYdMaterialMapper.insert(kdYdMaterial);
 

+ 0 - 20
mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdOrderDetailServiceImpl.java

@@ -1,20 +0,0 @@
-package com.malk.huagao.service.impl;
-
-import com.malk.huagao.entity.KdYdOrderDetail;
-import com.malk.huagao.mapper.KdYdOrderDetailMapper;
-import com.malk.huagao.service.IKdYdOrderDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author LQY
- * @since 2025-10-15
- */
-@Service
-public class KdYdOrderDetailServiceImpl extends ServiceImpl<KdYdOrderDetailMapper, KdYdOrderDetail> implements IKdYdOrderDetailService {
-
-}

+ 10 - 19
mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdOrderServiceImpl.java

@@ -127,11 +127,8 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
         kdYdOrder.setSyncStatus("0");
         kdYdOrder.setOperationType("1");
         kdYdOrder.setForminstid(formInstId);
-        if (type.equals("2")) {
-            kdYdOrder.setOperationType("2");
-            kdYdOrderMapper.update(kdYdOrder, new LambdaQueryWrapper<KdYdOrder>().eq(KdYdOrder::getDjbh, djbh));
-        } else if (type.equals("3")) {
-            kdYdOrder.setOperationType("3");
+        if ("2".equals(type) || "3".equals(type)) {
+            kdYdOrder.setOperationType(type);
             kdYdOrderMapper.update(kdYdOrder, new LambdaQueryWrapper<KdYdOrder>().eq(KdYdOrder::getDjbh, djbh));
         } else {
             kdYdOrderMapper.insert(kdYdOrder);
@@ -185,13 +182,10 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
             kdYdOrderDetail.setSyncStatus("0");
             kdYdOrderDetail.setOperationType("1");
             kdYdOrderDetail.setForminstid(formInstId);
-            if (type.equals("2")) {
-                kdYdOrderDetail.setOperationType("2");
-                kdYdOrderDetailMapper.update(kdYdOrderDetail, new LambdaQueryWrapper<KdYdOrderDetail>().eq(KdYdOrderDetail::getWlbm, wlbm)
-                        .eq(KdYdOrderDetail::getOrderId, id));
-            } else if (type.equals("3")) {
-                kdYdOrderDetail.setOperationType("3");
-                kdYdOrderDetailMapper.update(kdYdOrderDetail, new LambdaQueryWrapper<KdYdOrderDetail>().eq(KdYdOrderDetail::getWlbm, wlbm)
+            if ("2".equals(type) || "3".equals(type)) {
+                kdYdOrderDetail.setOperationType(type);
+                kdYdOrderDetailMapper.update(kdYdOrderDetail, new LambdaQueryWrapper<KdYdOrderDetail>()
+                        .eq(KdYdOrderDetail::getWlbm, wlbm)
                         .eq(KdYdOrderDetail::getOrderId, id));
             } else {
                 kdYdOrderDetailMapper.insert(kdYdOrderDetail);
@@ -219,13 +213,10 @@ public class KdYdOrderServiceImpl extends ServiceImpl<KdYdOrderMapper, KdYdOrder
                 kdYdOrderPayment.setEndTime(endTime);
                 kdYdOrderPayment.setSyncStatus("0");
                 kdYdOrderPayment.setOperationType("1");
-                if (type.equals("2")) {
-                    kdYdOrderPayment.setOperationType("2");
-                    kdYdOrderPaymentMapper.update(kdYdOrderPayment, new LambdaQueryWrapper<KdYdOrderPayment>().eq(KdYdOrderPayment::getDetailId, detailId)
-                            .eq(KdYdOrderPayment::getOrderId, id));
-                } else if (type.equals("3")) {
-                    kdYdOrderPayment.setOperationType("3");
-                    kdYdOrderPaymentMapper.update(kdYdOrderPayment, new LambdaQueryWrapper<KdYdOrderPayment>().eq(KdYdOrderPayment::getDetailId, detailId)
+                if ("2".equals(type) || "3".equals(type)) {
+                    kdYdOrderPayment.setOperationType(type);
+                    kdYdOrderPaymentMapper.update(kdYdOrderPayment, new LambdaQueryWrapper<KdYdOrderPayment>()
+                            .eq(KdYdOrderPayment::getDetailId, detailId)
                             .eq(KdYdOrderPayment::getOrderId, id));
                 } else {
                     kdYdOrderPaymentMapper.insert(kdYdOrderPayment);

+ 0 - 20
mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdOutboundDetailServiceImpl.java

@@ -1,20 +0,0 @@
-package com.malk.huagao.service.impl;
-
-import com.malk.huagao.entity.KdYdOutboundDetail;
-import com.malk.huagao.mapper.KdYdOutboundDetailMapper;
-import com.malk.huagao.service.IKdYdOutboundDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author LQY
- * @since 2025-10-15
- */
-@Service
-public class KdYdOutboundDetailServiceImpl extends ServiceImpl<KdYdOutboundDetailMapper, KdYdOutboundDetail> implements IKdYdOutboundDetailService {
-
-}

+ 0 - 20
mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdReceivableDetailServiceImpl.java

@@ -1,20 +0,0 @@
-package com.malk.huagao.service.impl;
-
-import com.malk.huagao.entity.KdYdReceivableDetail;
-import com.malk.huagao.mapper.KdYdReceivableDetailMapper;
-import com.malk.huagao.service.IKdYdReceivableDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author LQY
- * @since 2025-10-16
- */
-@Service
-public class KdYdReceivableDetailServiceImpl extends ServiceImpl<KdYdReceivableDetailMapper, KdYdReceivableDetail> implements IKdYdReceivableDetailService {
-
-}

+ 0 - 20
mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdZpDetailServiceImpl.java

@@ -1,20 +0,0 @@
-package com.malk.huagao.service.impl;
-
-import com.malk.huagao.entity.KdYdZpDetail;
-import com.malk.huagao.mapper.KdYdZpDetailMapper;
-import com.malk.huagao.service.IKdYdZpDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- *  服务实现类
- * </p>
- *
- * @author LQY
- * @since 2025-10-16
- */
-@Service
-public class KdYdZpDetailServiceImpl extends ServiceImpl<KdYdZpDetailMapper, KdYdZpDetail> implements IKdYdZpDetailService {
-
-}

+ 4 - 10
mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdZpServiceImpl.java

@@ -84,11 +84,8 @@ public class KdYdZpServiceImpl extends ServiceImpl<KdYdZpMapper, KdYdZp> impleme
         kdYdZp.setSpdzyx(spdzyx);
         kdYdZp.setCreateTime(LocalDateTime.now());
         kdYdZp.setForminstid(formInstId);
-        if (type.equals("2")) {
-            kdYdZp.setOperationType("2");
-            kdYdZpMapper.update(kdYdZp, new LambdaQueryWrapper<KdYdZp>().eq(KdYdZp::getDjbh, djbh));
-        } else if (type.equals("3")) {
-            kdYdZp.setOperationType("3");
+        if ("2".equals(type) || "3".equals(type)) {
+            kdYdZp.setOperationType(type);
             kdYdZpMapper.update(kdYdZp, new LambdaQueryWrapper<KdYdZp>().eq(KdYdZp::getDjbh, djbh));
         } else {
             kdYdZpMapper.insert(kdYdZp);
@@ -141,11 +138,8 @@ public class KdYdZpServiceImpl extends ServiceImpl<KdYdZpMapper, KdYdZp> impleme
             kdYdZpDetail.setDetailId(count);
             kdYdZpDetail.setSyncStatus("0");
             kdYdZpDetail.setOperationType("1");
-            if (type.equals("2")) {
-                kdYdZpDetail.setOperationType("2");
-                kdYdZpDetailMapper.update(kdYdZpDetail, new LambdaQueryWrapper<KdYdZpDetail>().eq(KdYdZpDetail::getDetailId, count));
-            } else if (type.equals("3")) {
-                kdYdZpDetail.setOperationType("3");
+            if ("2".equals(type) || "3".equals(type)) {
+                kdYdZpDetail.setOperationType(type);
                 kdYdZpDetailMapper.update(kdYdZpDetail, new LambdaQueryWrapper<KdYdZpDetail>().eq(KdYdZpDetail::getDetailId, count));
             } else {
                 kdYdZpDetailMapper.insert(kdYdZpDetail);

+ 3 - 3
mjava-huagao/src/main/java/com/malk/huagao/service/impl/YdHuaGaoServiceImpl.java

@@ -811,7 +811,7 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
                 try {
                     String wlbm = kdYdMaterial.getWlbm();
                     List<Map> list1 = (List<Map>) ydClient.queryData(YDParam.builder()
-                            .formUuid("FORM-E132ECE2BED94BCF81D9842B3F2054E7XWQ7")
+                            .formUuid("FORM-E64114E9F2C9426E91F92886EDFFA2C08Q90")
                             .appType("APP_VQDMMWS6OR1VHL8VMFD3")  // 新增:添加应用参数
                             .systemToken("XE766X81JHKXK4Z27SYOI86CPCLQ3J1LV7ODMH2")  // 新增:添加系统令牌
                             .searchFieldJson(JSONObject.toJSONString(UtilMap.map("textField_mfxbtcdh", wlbm)))
@@ -843,7 +843,7 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
             if (!list.isEmpty()) {
                 try {
                     ydClient.operateData(YDParam.builder()
-                            .formUuid("FORM-E132ECE2BED94BCF81D9842B3F2054E7XWQ7")
+                            .formUuid("FORM-E64114E9F2C9426E91F92886EDFFA2C08Q90")
                             .appType("APP_VQDMMWS6OR1VHL8VMFD3")
                             .systemToken("XE766X81JHKXK4Z27SYOI86CPCLQ3J1LV7ODMH2")
                             .formInstanceIdList(list)
@@ -919,7 +919,7 @@ public class YdHuaGaoServiceImpl implements YdHuaGaoService {
                 updateFormData.put("textField_mfxbtcea", jyzt);
                 updateFormData.put("textField_mg4h6mz5", wlbt);
                 ydClient.operateData(YDParam.builder()
-                        .formUuid("FORM-E132ECE2BED94BCF81D9842B3F2054E7XWQ7")
+                        .formUuid("FORM-E64114E9F2C9426E91F92886EDFFA2C08Q90")
                         .appType("APP_VQDMMWS6OR1VHL8VMFD3")
                         .systemToken("XE766X81JHKXK4Z27SYOI86CPCLQ3J1LV7ODMH2")
 //                        .searchCondition(JSONObject.toJSONString(UtilMap.map("textField_mg4h6mz5", wlbt)))

+ 1 - 1
mjava-huagao/src/main/java/com/malk/huagao/utils/MPGenerator.java

@@ -37,7 +37,7 @@ public class MPGenerator {
                             .entity("entity");
                 })
                 .strategyConfig(builder -> {
-                    builder.addInclude("")
+                    builder.addInclude("KD_YD_TRANSFER_DETAIL")
                             .entityBuilder().enableLombok();
                 })
                 .templateEngine(new VelocityTemplateEngine())