微调

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

@@ -239,6 +239,10 @@ public class WebService {
            } else if (request.getCode().equals("R062-1")) {
                result = iImsOutSupplyPickingService.synchronization(request.getData(), request.getCode());
            } else if (request.getCode().equals("R100")) {
+               if(!ObjectUtils.isEmpty(request.getData().get(0).get("AUDIT_ID")))
+               {
+                   iImsOtherOutstockService.synchronizationPush(request.getData(), request.getCode());
+               }
                result = iImsOtherOutstockService.synchronization(request.getData(), request.getCode());
            } else if (request.getCode().equals("R023")) {
                result = iImsGainService.synchronization(request.getData(), request.getCode());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/iost/ims/entity/ImsOtherOutstock.java

@@ -85,6 +85,14 @@ public class ImsOtherOutstock implements Serializable {
 	@Excel(name = "货主编码", width = 15)
     @ApiModelProperty(value = "货主编码")
     private java.lang.String shipperId;
+    /**出库单申请号*/
+    @Excel(name = "出库单申请号", width = 15)
+    @ApiModelProperty(value = "出库单申请号")
+    private java.lang.String auditId;
+    /**物料行号*/
+    @Excel(name = "物料行号", width = 15)
+    @ApiModelProperty(value = "物料行号")
+    private java.lang.String mtrlSeq;
     /**单据编号(金蝶里面单据类型)*/
     @Excel(name = "单据编号(金蝶里面单据类型)", width = 15)
     @ApiModelProperty(value = "单据编号(金蝶里面单据类型)")

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

@@ -72,12 +72,6 @@ public class ImsMtrlRejectApi implements web_api{
             ModelMap.put("FID", maps.get("FID"));
             ModelMap.put("FMRTYPE", "B"); //退料类型：默认库存退料
             ModelMap.put("FDate", maps.get("TRX_DATE"));  //交易时间
-            ModelMap.put("FSupplierID", new HashMap<String, Object>() {{
-                put("FNumber", maps.get("SUP_ID"));
-            }}); //供应商
-            ModelMap.put("FPurchaseOrgId", new HashMap<String, Object>() {{
-                put("FNumber", maps.get("ORG_ID"));
-            }}); //采购组织
         }
         ModelMap.put("FPURMRBENTRY", list);
         return ModelMap;

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

@@ -14,4 +14,5 @@ import java.util.Map;
  */
 public interface IImsOtherOutstockService extends IService<ImsOtherOutstock> {
     public String synchronization(List<Map<String,Object>> needLists,String code);
+    public String synchronizationPush(List<Map<String,Object>> needLists,String code);
 }