Merge branch 'master' of https://mc.cloudpure.cn/mjava/cont

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")

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 {
-
-}

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 {
-
-}

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 {
-
-}

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 {
-
-}

mjava-huagao/src/main/java/com/malk/huagao/controller/KdYdTransferController.java

@@ -0,0 +1,36 @@
+package com.malk.huagao.controller;
+
+import com.malk.huagao.service.IKdYdOrderService;
+import com.malk.huagao.service.IKdYdTransferService;
+import com.malk.server.common.McR;
+import com.malk.service.aliwork.YDClient;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author LQY
+ * @since 2025-11-12
+ */
+@RestController
+@RequestMapping("/hg")
+public class KdYdTransferController {
+    @Autowired
+    private YDClient ydClient;
+    @Autowired
+    private IKdYdTransferService kdYdTransferService;
+    @PostMapping("/kdYdTransfer")
+    McR insertTransfer(@RequestBody Map map) {
+        kdYdTransferService.insertTransfer(map);
+        return McR.success();
+    }
+}

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 {
-
-}

mjava-huagao/src/main/java/com/malk/huagao/entity/KdYdTransfer.java

@@ -0,0 +1,70 @@
+package com.malk.huagao.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author LQY
+ * @since 2025-11-12
+ */
+@Getter
+@Setter
+  @TableName("KD_YD_TRANSFER")
+public class KdYdTransfer implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+      private Long id;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime updateTime;
+
+    private String djlx;
+
+    private String cgy;
+
+    private String djbh;
+
+    private String dchzlx;
+
+    private String ywlx;
+
+    private LocalDateTime rq;
+
+    private String drhzlx;
+
+    private String dbfx;
+
+    private String dbdlx;
+
+    private String dcbm;
+
+    private String dchz;
+
+    private String drbm;
+
+    private String kh;
+
+    private String syncStatus;
+
+    private String operationType;
+
+    private String hdfs;
+
+    private String ysfs;
+
+    private String kdgs;
+
+    private String fkfs;
+}

mjava-huagao/src/main/java/com/malk/huagao/entity/KdYdTransferDetail.java

@@ -0,0 +1,64 @@
+package com.malk.huagao.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author LQY
+ * @since 2025-11-12
+ */
+@Getter
+@Setter
+  @TableName("KD_YD_TRANSFER_DETAIL")
+public class KdYdTransferDetail implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+      @TableId(value = "id", type = IdType.AUTO)
+      private Long id;
+
+    private LocalDateTime createTime;
+
+    private LocalDateTime updateTime;
+
+    private String wlbm;
+
+    private String wlmc;
+
+    private String ggxh;
+
+    private String dw;
+
+    private Integer dbsl;
+
+    private String ph;
+
+    private String dcck;
+
+    private String dccw;
+
+    private String drck;
+
+    private String drcw;
+
+    private String drckzt;
+
+    private String dcckzt;
+
+    private Integer detailId;
+
+    private String syncStatus;
+
+    private String operationType;
+
+    private Long transferId;
+}

mjava-huagao/src/main/java/com/malk/huagao/mapper/KdYdTransferDetailMapper.java

@@ -0,0 +1,16 @@
+package com.malk.huagao.mapper;
+
+import com.malk.huagao.entity.KdYdTransferDetail;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author LQY
+ * @since 2025-11-12
+ */
+public interface KdYdTransferDetailMapper extends BaseMapper<KdYdTransferDetail> {
+
+}

mjava-huagao/src/main/java/com/malk/huagao/mapper/KdYdTransferMapper.java

@@ -0,0 +1,16 @@
+package com.malk.huagao.mapper;
+
+import com.malk.huagao.entity.KdYdTransfer;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author LQY
+ * @since 2025-11-12
+ */
+public interface KdYdTransferMapper extends BaseMapper<KdYdTransfer> {
+
+}

mjava-huagao/src/main/java/com/malk/huagao/mapper/xml/KdYdTransferDetailMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.malk.huagao.mapper.KdYdTransferDetailMapper">
+
+</mapper>

mjava-huagao/src/main/java/com/malk/huagao/mapper/xml/KdYdTransferMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.malk.huagao.mapper.KdYdTransferMapper">
+
+</mapper>

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> {
-
-}

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> {
-
-}

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> {
-
-}

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> {
-
-}

mjava-huagao/src/main/java/com/malk/huagao/service/IKdYdTransferService.java

@@ -0,0 +1,20 @@
+package com.malk.huagao.service;
+
+import com.malk.huagao.entity.KdYdTransfer;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author LQY
+ * @since 2025-11-12
+ */
+public interface IKdYdTransferService extends IService<KdYdTransfer> {
+
+    void insertTransfer(Map map);
+
+}

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> {
-
-}

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(

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);
         }
     }

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);
         }
 

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 {
-
-}

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);
             }
 

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);
 

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 {
-
-}

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);

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 {
-
-}

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 {
-
-}

mjava-huagao/src/main/java/com/malk/huagao/service/impl/KdYdTransferServiceImpl.java

@@ -0,0 +1,207 @@
+package com.malk.huagao.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.malk.huagao.entity.KdYdDelivery;
+import com.malk.huagao.entity.KdYdDeliveryDetail;
+import com.malk.huagao.entity.KdYdTransfer;
+import com.malk.huagao.entity.KdYdTransferDetail;
+import com.malk.huagao.mapper.*;
+import com.malk.huagao.service.IKdYdTransferService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.malk.server.aliwork.YDConf;
+import com.malk.server.aliwork.YDParam;
+import com.malk.server.dingtalk.DDR_New;
+import com.malk.service.aliwork.YDClient;
+import com.malk.utils.UtilMap;
+import org.slf4j.MDC;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author LQY
+ * @since 2025-11-12
+ */
+@Service
+public class KdYdTransferServiceImpl extends ServiceImpl<KdYdTransferMapper, KdYdTransfer> implements IKdYdTransferService {
+    @Autowired
+    private YDClient ydClient;
+    @Autowired
+    private KdYdTransferMapper kdYdTransferMapper;
+    @Autowired
+    private KdYdTransferDetailMapper kdYdTransferDetailMapper;
+
+    @Override
+    public void insertTransfer(Map map) {
+        MDC.put("MDC_KEY_PID", "1003");
+        String formInstId = UtilMap.getString(map, "formInstId");
+        String type = UtilMap.getString(map, "type");
+        DDR_New ddrNew = ydClient.queryData(YDParam.builder()
+                .formInstId(formInstId)
+                .build(), YDConf.FORM_QUERY.retrieve_id);
+        Map formData = ddrNew.getFormData();
+
+        String djlx = UtilMap.getString(formData, "selectField_mhubzsa5");
+        LocalDateTime rq = parseTimestamp(UtilMap.getString(formData, "dateField_mhubzsab"));
+        String kh = UtilMap.getString(formData, "textField_mhubzsas");
+        String dchzlx = UtilMap.getString(formData, "selectField_mhubzsa7");
+        String djbh = UtilMap.getString(formData, "serialNumberField_mhubzsa4");
+        String ywlx = UtilMap.getString(formData, "textField_mhubzsa6");
+        String xsy = UtilMap.getString(formData, "employeeField_mhubzsa8").replace("[\"", "").replace("\"]", "").trim();
+        String dcbm = UtilMap.getString(formData, "departmentSelectField_mhubzsae").replace("[\"", "").replace("\"]", "").trim();
+        String drbm = UtilMap.getString(formData, "departmentSelectField_mhubzsad").replace("[\"", "").replace("\"]", "").trim();
+        String drhzlx = UtilMap.getString(formData, "selectField_mhubzsa9");
+        String dbfx = UtilMap.getString(formData, "selectField_mhubzsaa");
+        String dbdlx = UtilMap.getString(formData, "selectField_mhubzsac");
+        String dchz = UtilMap.getString(formData, "textField_mhubzsat");
+        String hdfs = UtilMap.getString(formData, "selectField_mhubzsah");
+        String ysfs = UtilMap.getString(formData, "selectField_mhubzsai");
+        String kdgs = UtilMap.getString(formData, "selectField_mhubzsar");
+        String fkfs = UtilMap.getString(formData, "selectField_mhubzsag");
+
+        List<Map> tableField = (List<Map>) formData.get("tableField_mhubzsau");
+        KdYdTransfer kdYdTransfer = new KdYdTransfer();
+        kdYdTransfer.setDjlx(djlx);
+        kdYdTransfer.setRq(rq);
+        kdYdTransfer.setKh(kh);
+        kdYdTransfer.setDjbh(djbh);
+        kdYdTransfer.setSyncStatus("0");
+        kdYdTransfer.setOperationType("1");
+        kdYdTransfer.setYsfs(ysfs);
+        kdYdTransfer.setHdfs(hdfs);
+        kdYdTransfer.setKdgs(kdgs);
+        kdYdTransfer.setFkfs(fkfs);
+        kdYdTransfer.setDchzlx(dchzlx);
+        kdYdTransfer.setDchz(dchz);
+        kdYdTransfer.setDchzlx(dchzlx);
+        kdYdTransfer.setDbfx(dbfx);
+        kdYdTransfer.setDbdlx(dbdlx);
+        kdYdTransfer.setDcbm(dcbm);
+        kdYdTransfer.setDrbm(drbm);
+        kdYdTransfer.setDrhzlx(drhzlx);
+        kdYdTransfer.setYwlx(ywlx);
+        kdYdTransfer.setCgy(xsy);
+
+        if ("2".equals(type) || "3".equals(type)) {
+            kdYdTransfer.setOperationType(type);
+            kdYdTransferMapper.update(kdYdTransfer, new LambdaQueryWrapper<KdYdTransfer>().eq(KdYdTransfer::getDjbh, djbh));
+        } else {
+            kdYdTransferMapper.insert(kdYdTransfer);
+        }
+
+        Long id = kdYdTransfer.getId();
+        int count = 1;
+        for (Map item : tableField) {
+            String wlbm = safeGetString(item, "textField_mhubzsav");
+            String wlmc = safeGetString(item, "textField_mhubzsaw");
+            String ggxh = safeGetString(item, "textField_mhubzsax");
+            String dw = safeGetString(item, "textField_mhubzsay");
+            int dbsl = parseInt(safeGetString(item, "numberField_mhubzsaz"), 0); // 如果为空或格式错误，返回 0
+            String ph = safeGetString(item, "textField_mhubzsb0");
+            String dcck = safeGetString(item, "textField_mhubzsb1");
+            String dcckzt = safeGetString(item, "textField_mhubzsb5");
+            String dccw = safeGetString(item, "textField_mhubzsb2");
+            String drck = safeGetString(item, "textField_mhubzsb3");
+            String drckzt = safeGetString(item, "textField_mhubzsb6");
+            String drcw = safeGetString(item, "textField_mhubzsb4");
+            KdYdTransferDetail kdYdTransferDetail = new KdYdTransferDetail();
+            kdYdTransferDetail.setTransferId(id);
+            kdYdTransferDetail.setWlbm(wlbm);
+            kdYdTransferDetail.setWlmc(wlmc);
+            kdYdTransferDetail.setGgxh(ggxh);
+            kdYdTransferDetail.setDetailId(count);
+            kdYdTransferDetail.setGgxh(ggxh);
+            kdYdTransferDetail.setDw(dw);
+            kdYdTransferDetail.setDbsl(dbsl);
+            kdYdTransferDetail.setPh(ph);
+            kdYdTransferDetail.setDcck(dcck);
+            kdYdTransferDetail.setDcckzt(dcckzt);
+            kdYdTransferDetail.setDccw(dccw);
+            kdYdTransferDetail.setDrck(drck);
+            kdYdTransferDetail.setDrckzt(drckzt);
+            kdYdTransferDetail.setDrcw(drcw);
+            kdYdTransferDetail.setSyncStatus("0");
+            kdYdTransferDetail.setOperationType("1");
+            if ("2".equals(type) || "3".equals(type)) {
+                kdYdTransferDetail.setOperationType(type);
+                kdYdTransferDetailMapper.update(kdYdTransferDetail, new LambdaQueryWrapper<KdYdTransferDetail>()
+                        .eq(KdYdTransferDetail::getWlbm, wlbm)
+                        .eq(KdYdTransferDetail::getTransferId, id));
+            } else {
+                kdYdTransferDetailMapper.insert(kdYdTransferDetail);
+            }
+
+            count++;
+//save(kdYdDeliveryDetail);
+        }
+//        ydClient.operateData(
+//                YDParam.builder()
+//                        .formInstanceId(formInstId)
+//                        .updateFormDataJson(JSONObject.toJSONString(UtilMap.map("textField_mgrqnxmm", id)))
+//                        .useLatestVersion(true).build(), YDConf.FORM_OPERATION.update);
+    }
+
+    private static LocalDateTime parseTimestamp(String timestampStr) {
+        if (timestampStr == null || timestampStr.trim().isEmpty()) return null;
+        try {
+            long timestamp = Long.parseLong(timestampStr.trim());
+            return LocalDateTime.ofInstant(
+                    Instant.ofEpochMilli(timestamp),
+                    ZoneId.systemDefault()
+            );
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+
+    private static int parseInt(String str, int defaultValue) {
+        if (str == null || str.trim().isEmpty()) {
+            return defaultValue;
+        }
+        try {
+            return Integer.parseInt(str.trim());
+        } catch (NumberFormatException e) {
+            return defaultValue;
+        }
+    }
+
+    private String safeGetString(Map formData, String key) {
+        Object val = formData.get(key);
+        return val == null ? "" : String.valueOf(val);
+    }
+
+    public static BigDecimal toBigDecimal(String str) {
+        if (str == null || str.trim().isEmpty()) {
+            return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
+        }
+        try {
+            return new BigDecimal(str.trim())
+                    .setScale(2, RoundingMode.HALF_UP);
+        } catch (NumberFormatException e) {
+            // 返回默认值而不是抛出异常，避免程序中断
+            return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
+        }
+    }
+
+    /**
+     * 重载方法，支持Number类型输入
+     */
+    public static BigDecimal toBigDecimal(Number number) {
+        if (number == null) {
+            return BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
+        }
+        return new BigDecimal(number.toString())
+                .setScale(2, RoundingMode.HALF_UP);
+    }
+}

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 {
-
-}

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);

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)))

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())