微调

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/controller/ImsBsWplanController.java

@@ -204,7 +204,7 @@ public class ImsBsWplanController extends JeecgController<ImsBsWplan, IImsBsWpla
         }
         Boolean flag = false;
         for (List<Object> list : lists) {
-            flag = imsBsWplanService.synchronization(list.get(0), sysUser);
+            flag = imsBsWplanService.synchronization(list.get(0), null, sysUser);
         }
         if (flag) {
             return Result.OK("同步成功");

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/kingdeeapi/SynKingdeeApi.java

@@ -25,6 +25,7 @@ public class SynKingdeeApi implements web_api {
         key.put("F_LQKJ_SyncDataId","F_LQKJ_SyncDataId");//同步记录数据内码
         key.put("F_LQKJ_Syncbill","F_LQKJ_Syncbill");//同步记录表单
         key.put("F_LQKJ_SyncCheck","F_LQKJ_SyncCheck");//同步
+        key.put("F_LQKJ_SyncDataEntryId","F_LQKJ_SyncDataEntryId");//行内吗
     }
     @Override
     public String add(Map json) {
@@ -64,6 +65,7 @@ public class SynKingdeeApi implements web_api {
                 salesordermap.put("dataid", list1.get(1).toString());
                 salesordermap.put("formid", list1.get(2).toString());
                 salesordermap.put("synchronization", list1.get(3).toString());
+                salesordermap.put("entryId", list1.get(4).toString());
                 salesorderlist.add(salesordermap);
             }
         }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/service/IImsBsWplanService.java

@@ -9,9 +9,12 @@ import java.text.ParseException;
 /**
  * @Description: 主计划基础信息
  * @Author: jeecg-boot
- * @Date:   2021-12-21
+ * @Date: 2021-12-21
  * @Version: V1.0
  */
 public interface IImsBsWplanService extends IService<ImsBsWplan> {
-    public Boolean synchronization(Object object,LoginUser sysUser) throws ParseException;
+
+    Boolean synchronization(Object object, Object entryId, LoginUser sysUser) throws ParseException;
+
+
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/service/impl/ISynServiceImpl.java

@@ -118,10 +118,10 @@ public class ISynServiceImpl extends ServiceImpl<SynMapper, Syn> implements ISyn
                         success = bsSupService.synchronization(data.get("dataid"), sysUser); //供应商
                     } else if (data.get("formid").equals("PRD_MO")) {
                         logName = "生产订单同步失败";
-                        success = bsWplanService.synchronization(data.get("dataid"), sysUser);//生产订单
+                        success = bsWplanService.synchronization(data.get("dataid"), data.get("entryId"), sysUser);//生产订单
                     } else if (data.get("formid").equals("SUB_SUBREQORDER")) {
                         logName = "委外订单同步失败";
-                        success = bsWplanService.synchronization(data.get("dataid"), sysUser);//委外订单
+                        success = bsWplanService.synchronization(data.get("dataid"), data.get("entryId"), sysUser);//委外订单
                     } else if (data.get("formid").equals("ENG_BOM")) {
                         logName = "BOM同步失败";
                         success = bsBomService.synchronization(data.get("dataid"), sysUser);//BOM
@@ -230,10 +230,10 @@ public class ISynServiceImpl extends ServiceImpl<SynMapper, Syn> implements ISyn
                         success = bsSupService.synchronization(data.get("dataid"), sysUser); //供应商
                     } else if (data.get("formid").equals("PRD_MO")) {
                         logName = "生产订单同步失败";
-                        success = bsWplanService.synchronization(data.get("dataid"), sysUser);//生产订单
+                        success = bsWplanService.synchronization(data.get("dataid"), data.get("entryId"), sysUser);//生产订单
                     } else if (data.get("formid").equals("SUB_SUBREQORDER")) {
                         logName = "委外订单同步失败";
-                        success = bsWplanService.synchronization(data.get("dataid"), sysUser);//委外订单
+                        success = bsWplanService.synchronization(data.get("dataid"), data.get("entryId"), sysUser);//委外订单
                     } else if (data.get("formid").equals("ENG_BOM")) {
                         logName = "BOM同步失败";
                         success = bsBomService.synchronization(data.get("dataid"), sysUser);//BOM

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/service/impl/ImsBsWplanServiceImpl.java

 package org.jeecg.modules.iost.ims.service.impl;
 
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.ThreadLocalConfig;
@@ -13,8 +14,6 @@ import org.jeecg.modules.iost.ims.mapper.ImsBsWplanMapper;
 import org.jeecg.modules.iost.ims.service.IImsBsWplanService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
@@ -37,7 +36,7 @@ public class ImsBsWplanServiceImpl extends ServiceImpl<ImsBsWplanMapper, ImsBsWp
     IMSApi imsApi;
 
     @Override
-    public Boolean synchronization(Object object, LoginUser sysUser) throws ParseException {
+    public Boolean synchronization(Object object, Object entryId, LoginUser sysUser) throws ParseException {
         //追加参数(上下文对象)
         String kingdeeLogOZTName = "主计划基础信息";
         Map map2 = ThreadLocalConfig.get();
@@ -51,6 +50,9 @@ public class ImsBsWplanServiceImpl extends ServiceImpl<ImsBsWplanMapper, ImsBsWp
         Map<String, String> idmap = new HashMap<>();
         //设置需要同步的主键
         idmap.put("FID", object.toString());
+        if (entryId != null) {
+            idmap.put("FTreeEntity_FEntryId", entryId.toString());
+        }
         //将对应信息请求金蝶云
         list = kingdeeApi.select(idmap, null);
 
@@ -87,7 +89,7 @@ public class ImsBsWplanServiceImpl extends ServiceImpl<ImsBsWplanMapper, ImsBsWp
                 for (List o : lists) {
                     Map<String, Object> bs_wplan_mn_mtrl = new HashMap<>();
                     if (StringUtils.isNotBlank(o.get(1).toString()) && !"0.0".equals(o.get(1).toString())) {
-                        bs_wplan_mn_mtrl.put("dosage", new BigDecimal(o.get(0).toString()).divide(new BigDecimal(o.get(1).toString()), 6, BigDecimal.ROUND_HALF_UP));
+                        bs_wplan_mn_mtrl.put("dosage", new BigDecimal(o.get(0).toString()));
                     } else {
                         bs_wplan_mn_mtrl.put("dosage", 0);
                     }
@@ -117,7 +119,7 @@ public class ImsBsWplanServiceImpl extends ServiceImpl<ImsBsWplanMapper, ImsBsWp
                     }
                 }
             } else {
-                Map<String, Object> bs_wplan_mn_mtrl = new HashMap<>();
+                Map<String, Object> bs_wplan_mn_mtrl = new HashMap<>(10);
                 bs_wplan_mn_mtrl.put("dosage", new BigDecimal(0));
                 bs_wplan_mn_mtrl.put("nn_qty", new BigDecimal(0));
                 bs_wplan_mn_mtrl.put("tn_qty", new BigDecimal(0));
@@ -128,7 +130,7 @@ public class ImsBsWplanServiceImpl extends ServiceImpl<ImsBsWplanMapper, ImsBsWp
                 bs_wplan_mn_mtrl.put("main_code", "");
                 bsList.add(bs_wplan_mn_mtrl);
             }
-            Map<String, Object> datalist = new HashMap<>();
+            Map<String, Object> datalist = new HashMap<>(12);
             datalist.put("org_id", data.get("orgId"));
             datalist.put("wplan_code", data.get("wplanCode"));
             datalist.put("erp_mo", data.get("erpMo"));