2026.4.13 早

接口回传，以及接口接收直接审核，回传表修改

ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java

@@ -39,7 +39,7 @@ public class ToErpApiController {
 
 
     /**
-     * 回传其他入库单
+     * 回传入库单（废弃）
      */
     //@Scheduled(fixedDelay = 1500)
     @RequestMapping("/callbackInDeliveryNotice")
@@ -48,8 +48,30 @@ public class ToErpApiController {
         toErpService.callbackInDeliveryNotice();
     }
 
+
     /**
-     * 回传其他出库单
+     * 回传入库单
+     */
+    @Scheduled(fixedDelay = 1500)
+    @RequestMapping("/callbackInDeliveryNotice")
+    @ResponseBody
+    public void callbackInDeliveryNoticeNew() {
+        toErpService.callbackInDeliveryNoticeNew();
+    }
+
+
+    /**
+     * 回传出库单(新)
+     */
+    //        @Scheduled(fixedDelay = 1500)
+    @RequestMapping("/callbackOutDeliveryNotice")
+    @ResponseBody
+    public void callbackDeliveryOutNoticeNew() {
+        toErpService.callbackDeliveryOutNoticeNew();
+    }
+
+    /**
+     * 回传其他出库单(废弃)
      */
 //        @Scheduled(fixedDelay = 1500)
     @RequestMapping("/callbackOutDeliveryNotice")

ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErp.java

@@ -0,0 +1,63 @@
+package com.ruoyi.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+public class CallBackErp implements Serializable {
+
+    /**
+
+     * | 方向    | 字段名           | 对应方向 | 字段名   |
+     * | ------- | ---------------- | -------- | -------- |
+     * | ERP→WMS | companyShortName | WMS→ERP  | ccompany |   公司简称
+     * | ERP→WMS | accountSetNo     | WMS→ERP  | cacc_id  |   账套号
+     * | ERP→WMS | warehouseId      | WMS→ERP  | cwhcode  |   仓库
+     * | ERP→WMS | customerId       | WMS→ERP  | cvencode |   客户
+     * | ERP→WMS | customerName     | WMS→ERP  | cvenname |    客户名称
+     * | ERP→WMS | remark           | WMS→ERP  | cmemo    |
+     *
+     */
+    // 公司名称
+    @JsonProperty("ccompany")
+    private String ccompany;
+    // WMS单据号
+    @JsonProperty("ccode")
+    private String ccode;
+    // 操作日期
+    @JsonProperty("ddate")
+    private String ddate;
+    // 业务类型
+    @JsonProperty("cintype")
+    private String cintype;
+    //  供应商编码
+    @JsonProperty("cvencode")
+    private String cvencode;
+    // 供应商名称
+    @JsonProperty("cvenname")
+    private String cvenname;
+    // 出/入库人 操作人
+    @JsonProperty("coptname")
+    private String coptname;
+    //  仓库编码
+    @JsonProperty("cwhcode")
+    private String cwhcode;
+    //  仓库名称
+    @JsonProperty("cwhname")
+    private String cwhname;
+    //  备注
+    @JsonProperty("cmemo")
+    private String cmemo;
+    //  账套号
+    @JsonProperty("cacc_id")
+    private String caccId;
+    // 子明细
+    @JsonProperty("details")
+    private List<CallBackErpItems> details;
+
+}

ruoyi-admin/src/main/java/com/ruoyi/api/domain/CallBackErpItems.java

@@ -0,0 +1,60 @@
+package com.ruoyi.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.List;
+
+@NoArgsConstructor
+@Data
+@Getter
+@Setter
+public class CallBackErpItems implements Serializable {
+        /**
+         *
+         * | 方向    | 字段名        | 对应方向 | 字段名    |
+         * | ------- | ------------- | -------- | --------- |
+         * | ERP→WMS | lineNo        | WMS→ERP  | srcrowno  |
+         * | ERP→WMS | sourceLineId  | WMS→ERP  | srcids    |
+         * | ERP→WMS | oldProjectNo  | WMS→ERP  | cxmh      |
+         * | ERP→WMS | projectNo     | WMS→ERP  | cnewxmh   |
+         * | ERP→WMS | isBatchManage | WMS→ERP  | binvbatch |
+         * | ERP→WMS | lotNo         | WMS→ERP  | cbatch    |
+         */
+
+        @JsonProperty("cinvcode")
+        private String cinvcode;
+        @JsonProperty("cinvname")
+        private String cinvname;
+        @JsonProperty("cinvstd")
+        private String cinvstd;
+        @JsonProperty("cinvm_unit")
+        private String cinvmUnit;
+        @JsonProperty("cposcode")
+        private String cposcode;
+        @JsonProperty("cposname")
+        private String cposname;
+        @JsonProperty("ctrayname")
+        private String ctrayname;
+        @JsonProperty("cbatch")
+        private String cbatch;
+        @JsonProperty("iquantity")
+        private Integer iquantity;
+        @JsonProperty("cxmh")
+        private String cxmh;
+        @JsonProperty("cnewxmh")
+        private String cnewxmh;
+        @JsonProperty("srccode")
+        private String srccode;
+        @JsonProperty("srcids")
+        private Integer srcids;
+        @JsonProperty("srcrowno")
+        private String srcrowno;
+        @JsonProperty("binvbatch")
+        private Integer binvbatch;
+    }
+

ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java

@@ -18,41 +18,86 @@ import java.util.List;
 public class DeliveryNoticeItemVo {
 
 
-    /** 行号 */
+    /**
+     * 行号
+     */
     private String lineNo;
-    /** 对应通知行号 */
+    /**
+     * 对应通知行号
+     */
     private String notelineNo;
-    /** 单据号 */
+    /**
+     * 单据号
+     */
     private String billNo;
-    /** 存货编码 */
+    /**
+     * 存货编码
+     */
     private String inventoryCode;
-    /** 存货名称 */
+    /**
+     * 存货名称
+     */
     private String inventoryName;
-    /** 规格型号 */
+    /**
+     * 规格型号
+     */
     private String specModel;
-    /** 层级关系 */
+    /**
+     * 层级关系
+     */
     private String levelRelation;
-    /** 上层物料 */
+    /**
+     * 上层物料
+     */
     private String upperMaterial;
-    /** 顶层物料 */
+    /**
+     * 顶层物料
+     */
     private String topMaterial;
-    /** 批次 */
+    /**
+     * 批次
+     */
     private String lotNo;
-    /** 计量单位 */
+    /**
+     * 计量单位
+     */
     private String unit;
-    /** 数量 */
+    /**
+     * 数量
+     */
     private String quantity;
-    /** 备注 */
+    /**
+     * 备注
+     */
     private String remark;
 
     private List<LocationDetail> locations;
-    /**货位*/
+    /**
+     * 货位
+     */
     private String area;
-   /**托盘*/
+    /**
+     * 托盘
+     */
     private String location;
 
     private String areaBefore;
 
     private String locationBefore;
+    /**
+     * erp子表主键
+     ***/
+    private String sourceLineId;
+    /**
+     * 条码号
+     ***/
+    private String barCode;
+    /**
+     * 是否批次管理
+     **/
+    private String isBatchManage;
+
+    /**旧项目号**/
+    private String oldProjectNo;
 
 }

ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeVo.java

@@ -53,6 +53,11 @@ public class DeliveryNoticeVo {
     private String destination;
     /** 领料车间 */
     private String workshop;
+    /** 公司简称**/
+    private String companyShortName;
+    /** 账套号**/
+    private String accountSetNo;
+
     /** 子表明细列表 */
     private List<DeliveryNoticeItemVo> detailList;
 }

ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java

@@ -20,4 +20,8 @@ public interface IToErpService {
     void moveCargoSpace();
 
     AjaxResult createWorkshopInboundOrder(BasProduct basProduct);
+
+    void callbackInDeliveryNoticeNew();
+
+    void callbackDeliveryOutNoticeNew();
 }

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java

@@ -174,9 +174,9 @@ public class ToErpServiceImpl implements IToErpService {
                 inStockin.setInType(deliveryNoticeVo.getBillType());
                 inStockin.setCreateDate(deliveryNoticeVo.getBillDate());
                 inStockin.setCreateManId(deliveryNoticeVo.getCreateMan());
-                inStockin.setStatus("1");
+                inStockin.setStatus("2");
                 inStockin.setWarehouseId(deliveryNoticeVo.getWarehouseId());
-//                inStockin.setErpBill(deliveryNoticeVo.getBillNo());
+                inStockin.setErpBill(deliveryNoticeVo.getBillNo());
                 inStockin.setStockSource("1");
                 inStockin.setDepartmentNo(deliveryNoticeVo.getProjectNo());//项目号
                 inStockin.setSupplierNo(deliveryNoticeVo.getCustomerId());//供应商编码
@@ -186,6 +186,8 @@ public class ToErpServiceImpl implements IToErpService {
                 inStockin.setSpare3(deliveryNoticeVo.getApproveDate());//审核时间
                 inStockin.setSpare4(deliveryNoticeVo.getApproveMan());//审核人
                 inStockin.setSpare5(deliveryNoticeVo.getRemark());
+                inStockin.setCompanyShortName(deliveryNoticeVo.getCompanyShortName());
+                inStockin.setAccountSetNo(deliveryNoticeVo.getAccountSetNo());
                 if (exist == null) {
                     inStockinService.insertInStockin(inStockin);
                 } else {
@@ -213,6 +215,10 @@ public class ToErpServiceImpl implements IToErpService {
                     detail.setRemark(item.getRemark());
                     detail.setAssignNum("0");
                     detail.setScanNum("0");
+                    detail.setSourceLineId(item.getSourceLineId());
+                    detail.setBarCode(item.getBarCode());
+                    detail.setIsBatchManage(item.getIsBatchManage());
+                    detail.setOldProjectNo(item.getOldProjectNo());
                     inStockinDetailService.insertInStockinDetail(detail);
 
                 }
@@ -265,8 +271,9 @@ public class ToErpServiceImpl implements IToErpService {
                 out.setStockoutId(deliveryNoticeVo.getBillNo());
                 out.setOutType(deliveryNoticeVo.getBillType());
                 out.setCreateDate(deliveryNoticeVo.getBillDate());
+                out.setErpStockoutId(deliveryNoticeVo.getBillNo());
                 out.setCreateManId(deliveryNoticeVo.getCreateMan());
-                out.setStatus("1");
+                out.setStatus("2");
                 out.setWarehouseId(deliveryNoticeVo.getWarehouseId());
                 out.setStockoutSource("1");
                 out.setSpare6(deliveryNoticeVo.getOutType());
@@ -280,6 +287,8 @@ public class ToErpServiceImpl implements IToErpService {
                 out.setSpare4(deliveryNoticeVo.getApproveMan());//审核人
                 out.setSpare5(deliveryNoticeVo.getRemark());
                 out.setSpare7(deliveryNoticeVo.getDestination());
+                out.setCompanyShortName(deliveryNoticeVo.getCompanyShortName());
+                out.setAccountSetNo(deliveryNoticeVo.getAccountSetNo());
 
                 if (exist == null) {
                     outStockoutService.insertOutStockout(out);
@@ -309,8 +318,12 @@ public class ToErpServiceImpl implements IToErpService {
                     d.setSpare2(item.getUpperMaterial());
                     d.setSpare3(item.getTopMaterial());
                     d.setSpare4(deliveryNoticeVo.getProjectNo());
-//                    d.setSpare6(item.getLineNo());
+                    d.setSpare6(item.getLineNo());
                     d.setRemark(item.getRemark());
+                    d.setSourceLineId(item.getSourceLineId());
+                    d.setBarCode(item.getBarCode());
+                    d.setIsBatchManage(item.getIsBatchManage());
+                    d.setOldProjectNo(item.getOldProjectNo());
                     //d.setSpare8(deliveryNoticeVo.getDestination());
 
 
@@ -334,7 +347,6 @@ public class ToErpServiceImpl implements IToErpService {
 
     @Override
     public void callbackInDeliveryNotice() {
-
         InStockinBack inStockin = inStockinBackService.selectTopInStockin();
         if (inStockin == null) {
             return;
@@ -345,16 +357,12 @@ public class ToErpServiceImpl implements IToErpService {
         deliveryNoticeVo.setBillType(inStockin.getInType());
         deliveryNoticeVo.setOpType("1");
         deliveryNoticeVo.setBillDate(inStockin.getCreateDate());
-//        deliveryNoticeVo.setCreateMan(inStockin.getCreateManId());
         deliveryNoticeVo.setWarehouseId(inStockin.getWarehouseId());
         deliveryNoticeVo.setProjectNo(inStockin.getDepartmentNo());
         deliveryNoticeVo.setCustomerId(inStockin.getSupplierNo());
         deliveryNoticeVo.setCustomerName(inStockin.getClassNo()); // 对应receiveDeliveryNotice中的映射
         deliveryNoticeVo.setContractNo(inStockin.getSpare1());
-//        deliveryNoticeVo.setSalesOrderNo(inStockin.getSpare2());
+
-//        deliveryNoticeVo.setApproveDate(inStockin.getSpare3());
-//        deliveryNoticeVo.setApproveMan(inStockin.getSpare4());
-//        deliveryNoticeVo.setRemark(inStockin.getSpare5());
 
         InStockinDetailBack inStockinDetailParam = new InStockinDetailBack();
         inStockinDetailParam.setStockinId(inStockin.getStockinId());
@@ -382,7 +390,7 @@ public class ToErpServiceImpl implements IToErpService {
                 String[] splitLocation = detail.getSpare8().split(",");
                 String[] splitQuantity = detail.getQuantityX().split(",");
                 ArrayList<LocationDetail> locationDetails = new ArrayList<>();
-                for(int i=0;i<splitArea.length;i++) {
+                for (int i = 0; i < splitArea.length; i++) {
                     LocationDetail locationDetail = new LocationDetail();
                     locationDetail.setLocationNo(splitLocation[i]);
                     locationDetail.setQuantity(splitQuantity[i]);
@@ -397,7 +405,7 @@ public class ToErpServiceImpl implements IToErpService {
         }
         deliveryNoticeVo.setDetailList(detailList);
 
-        String sendMsg=JSONUtil.toJsonStr(deliveryNoticeVo);
+        String sendMsg = JSONUtil.toJsonStr(deliveryNoticeVo);
         try {
             //todo 发送给erp  成功失败改状态
             RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.235/app1/api?type=1&key=1", JSONUtil.toJsonStr(deliveryNoticeVo), "入库回传", "wms", "erp");
@@ -457,7 +465,7 @@ public class ToErpServiceImpl implements IToErpService {
 //        outStockoutDetailBack.setSendStatus("0");
         List<OutStockoutDetailBack> outStockoutDetailBacks = outStockoutDetailBackService.selectOutStockoutDetailBackList(outStockoutDetailBack);
         List<DeliveryNoticeItemVo> detailList = new ArrayList<>();
-        if(outStockoutDetailBacks != null && !outStockoutDetailBacks.isEmpty()) {
+        if (outStockoutDetailBacks != null && !outStockoutDetailBacks.isEmpty()) {
             for (OutStockoutDetailBack detail : outStockoutDetailBacks) {
                 DeliveryNoticeItemVo item = new DeliveryNoticeItemVo();
                 item.setLineNo(detail.getStockoutDetailId());
@@ -479,7 +487,7 @@ public class ToErpServiceImpl implements IToErpService {
                 String[] splitQuantity = detail.getQuantityX().split(",");
                 String[] lotNo = detail.getLotNo().split(",");
                 ArrayList<LocationDetail> locationDetails = new ArrayList<>();
-                for(int i=0;i<splitArea.length;i++) {
+                for (int i = 0; i < splitArea.length; i++) {
                     LocationDetail locationDetail = new LocationDetail();
                     locationDetail.setLocationNo(splitLocation[i]);
                     locationDetail.setQuantity(splitQuantity[i]);
@@ -640,6 +648,212 @@ public class ToErpServiceImpl implements IToErpService {
         }
     }
 
+    @Override
+    public void callbackInDeliveryNoticeNew() {
+
+        InStockinBack inStockin = inStockinBackService.selectTopInStockin();
+        if (inStockin == null) {
+            return;
+        }
+        CallBackErp callBackErp = new CallBackErp();
+        callBackErp.setCcompany(inStockin.getCompanyShortName());  // 公司简称
+        callBackErp.setCcode(inStockin.getStockinId());    // wms 单据号
+        callBackErp.setDdate(inStockin.getFinishDate());       // 操作日期
+        callBackErp.setCintype("1");     // 业务类型
+        callBackErp.setCvencode(inStockin.getSupplierNo()); // 供应商编码
+        callBackErp.setCvenname(inStockin.getSupplierNo());   // 供应商名称
+        callBackErp.setCoptname(inStockin.getCreateManId());  // 操作人
+        callBackErp.setCmemo(inStockin.getRemark());    // 备注
+        callBackErp.setCaccId(inStockin.getAccountSetNo());    // 账套号
+        callBackErp.setCwhcode("01");   // 仓库编码
+        callBackErp.setCwhname("立体库");   //  仓库名称
+
+
+        // TODO 以下需要重新编写根据给的字段
+        InStockinDetailBack inStockinDetailParam = new InStockinDetailBack();
+        inStockinDetailParam.setStockinId(inStockin.getStockinId());
+        inStockinDetailParam.setSendStatus("0");
+        List<InStockinDetailBack> inStockinDetails = inStockinDetailBackService.selectInStockinDetailBackList(inStockinDetailParam);
+
+        List<CallBackErpItems> detailList = new ArrayList<>();
+        if (inStockinDetails != null && !inStockinDetails.isEmpty()) {
+            for (InStockinDetailBack detail : inStockinDetails) {
+                CallBackErpItems item = new CallBackErpItems();
+                // 存货编码
+                item.setCinvcode(detail.getProductId());
+                // 存货名称
+                item.setCinvname(detail.getProductName());
+                // 规格型号
+                item.setCinvstd(detail.getSpec());
+                // 单位
+                item.setCinvmUnit(detail.getUnit());
+                // 货位编码
+                item.setCposcode(detail.getSpare9());
+                // 货位名称
+                item.setCposname("");
+                // 托盘号
+                item.setCtrayname(detail.getSpare8());
+                // 批号
+                item.setCbatch(detail.getLotNo());
+//                item.setLotNo(detail.getLotNo());
+                // 数量
+                item.setIquantity(Integer.valueOf(detail.getAssignNum()));
+                // 老项目号
+                item.setCxmh(detail.getOldProjectNo());
+                // 新项目号
+                item.setCnewxmh(detail.getSpare4());
+                // erpbillno
+                item.setSrccode(inStockin.getErpBill());
+                // erp来源单子表id
+                item.setSrcids(Integer.valueOf(detail.getSourceLineId()));
+                // erp子表行号
+                item.setSrcrowno(detail.getSpare6());
+                // 是否批次管理
+                item.setBinvbatch(Integer.valueOf(detail.getIsBatchManage()));
+
+
+                detailList.add(item);
+            }
+        }
+        callBackErp.setDetails(detailList);
+
+        String sendMsg = JSONUtil.toJsonStr(callBackErp);
+        try {
+            //todo 发送给erp  成功失败改状态
+            RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.235/app1/api?type=1&key=1", JSONUtil.toJsonStr(callBackErp), "入库回传", "wms", "erp");
+            if ("1".equals(requestLog.getIsSuccessful())) {
+                inStockin.setSendStatus("1");
+                inStockin.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                inStockin.setMsg("成功");
+                inStockinDetailParam.setSendStatus("1");
+                inStockinDetailParam.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                inStockinDetailParam.setMsg("成功");
+            } else {
+                inStockin.setSendStatus("2");
+                inStockin.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                inStockin.setMsg(requestLog.getErrorDetails());
+                inStockinDetailParam.setSendStatus("2");
+                inStockinDetailParam.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                inStockinDetailParam.setMsg(requestLog.getErrorDetails());
+            }
+            inStockinBackService.updateInStockinBack(inStockin);
+            inStockinDetailBackService.updateInStockinDetailBack(inStockinDetailParam);
+
+        } catch (Exception e) {
+            inStockin.setSendStatus("2");
+            inStockin.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            inStockin.setMsg(e.getMessage());
+            inStockinDetailParam.setSendStatus("2");
+            inStockinDetailParam.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            inStockinDetailParam.setMsg(e.getMessage());
+            inStockinBackService.updateInStockinBack(inStockin);
+            inStockinDetailBackService.updateInStockinDetailBack(inStockinDetailParam);
+        }
+
+    }
+
+    @Override
+    public void callbackDeliveryOutNoticeNew() {
+        OutStockoutBack outStockoutBack = outStockoutBackService.selelctTopOutStockout();
+        if (outStockoutBack == null) {
+            return;
+        }
+        CallBackErp callBackErp = new CallBackErp();
+        callBackErp.setCcompany(outStockoutBack.getCompanyShortName());  // 公司简称
+        callBackErp.setCcode(outStockoutBack.getStockoutId());    // wms 单据号
+        callBackErp.setDdate(outStockoutBack.getFinishDate());       // 操作日期
+        callBackErp.setCintype("1");     // 业务类型
+        callBackErp.setCvencode(outStockoutBack.getCustomerNo()); // 供应商编码
+        callBackErp.setCvenname(outStockoutBack.getCustomerNo());   // 供应商名称
+        callBackErp.setCoptname(outStockoutBack.getCreateManId());  // 操作人
+        callBackErp.setCmemo(outStockoutBack.getRemark());    // 备注
+        callBackErp.setCaccId(outStockoutBack.getAccountSetNo());    // 账套号
+        callBackErp.setCwhcode("01");   // 仓库编码
+        callBackErp.setCwhname("立体库");   //  仓库名称
+
+
+        OutStockoutDetailBack outStockoutDetailBack = new OutStockoutDetailBack();
+        outStockoutDetailBack.setStockoutId(outStockoutBack.getStockoutId());
+        outStockoutDetailBack.setSendStatus("0");
+//        outStockoutDetailBack.setSendStatus("0");
+        List<OutStockoutDetailBack> outStockoutDetailBacks = outStockoutDetailBackService.selectOutStockoutDetailBackList(outStockoutDetailBack);
+        List<CallBackErpItems> detailList = new ArrayList<>();
+        if (outStockoutDetailBacks != null && !outStockoutDetailBacks.isEmpty()) {
+            for (OutStockoutDetailBack detail : outStockoutDetailBacks) {
+                CallBackErpItems item = new CallBackErpItems();
+                // 存货编码
+                item.setCinvcode(detail.getProductId());
+                // 存货名称
+                item.setCinvname(detail.getProductName());
+                // 规格型号
+                item.setCinvstd(detail.getSpec());
+                // 单位
+                item.setCinvmUnit(detail.getUnit());
+                // 货位编码
+                item.setCposcode(detail.getSpare9());
+                // 货位名称
+                item.setCposname("");
+                // 托盘号
+                item.setCtrayname(detail.getSpare8());
+                // 批号
+                item.setCbatch(detail.getLotNo());
+//                item.setLotNo(detail.getLotNo());
+                // 数量
+                item.setIquantity(Integer.parseInt(String.valueOf(detail.getAssignNum())));
+                // 老项目号
+                item.setCxmh(detail.getOldProjectNo());
+                // 新项目号
+                item.setCnewxmh(detail.getSpare4());
+                // erpbillno
+                item.setSrccode(outStockoutBack.getErpStockoutId());
+                // erp来源单子表id
+                item.setSrcids(Integer.valueOf(detail.getSourceLineId()));
+                // erp子表行号
+                item.setSrcrowno(detail.getSpare6());
+                // 是否批次管理
+                item.setBinvbatch(Integer.valueOf(detail.getIsBatchManage()));
+
+
+                detailList.add(item);
+            }
+
+        }
+
+        try {
+            //todo 发送给erp  成功失败改状态
+            RequestLog requestLog = requestLogService.getRequestLog("http://192.168.188.235/app1/api?type=1&key=1", JSONUtil.toJsonStr(callBackErp), "出库回传", "wms", "erp");
+            if ("1".equals(requestLog.getIsSuccessful())) {
+                outStockoutBack.setSendStatus("1");
+                outStockoutBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                outStockoutBack.setMsg("成功");
+                outStockoutDetailBack.setSendStatus("1");
+                outStockoutDetailBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                outStockoutDetailBack.setMsg("成功");
+
+            } else {
+                outStockoutBack.setSendStatus("2");
+                outStockoutBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                outStockoutBack.setMsg(requestLog.getErrorDetails());
+                outStockoutDetailBack.setSendStatus("2");
+                outStockoutDetailBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+                outStockoutDetailBack.setMsg(requestLog.getErrorDetails());
+            }
+            outStockoutBackService.updateOutStockoutBack(outStockoutBack);
+            outStockoutDetailBackService.updateOutStockoutDetailBack(outStockoutDetailBack);
+
+        } catch (Exception e) {
+            outStockoutBack.setSendStatus("2");
+            outStockoutBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            outStockoutBack.setMsg(e.getMessage());
+            outStockoutDetailBack.setSendStatus("2");
+            outStockoutDetailBack.setSendTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+            outStockoutDetailBack.setMsg(e.getMessage());
+            outStockoutBackService.updateOutStockoutBack(outStockoutBack);
+            outStockoutDetailBackService.updateOutStockoutDetailBack(outStockoutDetailBack);
+        }
+
+    }
+
 
     public AjaxResult createOtherInOutboundOrder(TransferBillCallback transferBillCallback) {
         ErpInterfaceParam<ErpInOutBoundOrder> param = new ErpInterfaceParam<>();

ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java

@@ -44,7 +44,7 @@ public class ToWcsServiceImpl implements IToWcsService {
 
 
     @Override
-    @Scheduled(fixedDelay=1500)
+    eduled(fixedDelay=1500)
     public void pushOutMydoJob() {
         //查询所有未推送的料箱出库作业
         MydoJob mydoJobParam = new MydoJob();

ruoyi-admin/src/main/java/com/ruoyi/in/stockin/domain/InStockin.java

@@ -13,90 +13,127 @@ import java.util.List;
  * @author ruoyi
  * @date 2025-05-20
  */
-public class InStockin extends BaseEntity
+public class InStockin extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
-    /** GUID */
+    /**
+     * GUID
+     */
     private String stockinGuid;
 
-    /** 入库订单ID */
+    /**
+     * 入库订单ID
+     */
     @Excel(name = "入库订单ID")
     private String stockinId;
 
-    /** 入库类型 */
+    /**
+     * 入库类型
+     */
     @Excel(name = "入库类型")
     private String inType;
 
-    /** 建立时间 */
+    /**
+     * 建立时间
+     */
     @Excel(name = "建立时间")
     private String createDate;
 
-    /** 创建人 */
+    /**
+     * 创建人
+     */
 
     private String createManId;
     @Excel(name = "创建人")
     private String createManName;
 
-    /** 单据状态 */
+    /**
+     * 单据状态
+     */
     @Excel(name = "单据状态")
     private String status;
 
-    /** 仓库ID */
+    /**
+     * 仓库ID
+     */
     @Excel(name = "仓库ID")
     private String warehouseId;
     @Excel(name = "仓库")
     private String warehouseName;
 
-    /**  完成日期 */
+    /**
+     * 完成日期
+     */
     @Excel(name = " 完成日期")
     private String finishDate;
 
-    /** erp单号 */
+    /**
+     * erp单号
+     */
     @Excel(name = "erp单号")
     private String erpBill;
 
-    /** 单据来源 */
+    /**
+     * 单据来源
+     */
     @Excel(name = "单据来源")
     private String stockSource;
 
-    /** 部门编码 */
+    /**
+     * 部门编码
+     */
     @Excel(name = "部门编码")
     private String departmentNo;
     @Excel(name = "部门")
     private String departmentName;
 
-    /** 客户编码 */
+    /**
+     * 客户编码
+     */
     @Excel(name = "客户编码")
     private String customerNo;
 
-    /** 班组编码 */
+    /**
+     * 班组编码
+     */
     @Excel(name = "班组编码")
     private String classNo;
 
-    /** 供应商编码 */
+    /**
+     * 供应商编码
+     */
     @Excel(name = "供应商编码")
     private String supplierNo;
     @Excel(name = "供应商")
     private String supplierName;
 
-    /** 备用字段1 */
+    /**
+     * 备用字段1
+     */
     @Excel(name = "备用字段1")
     private String spare1;
 
-    /** 备用字段2 */
+    /**
+     * 备用字段2
+     */
     @Excel(name = "备用字段2")
     private String spare2;
 
-    /** 备用字段4 */
+    /**
+     * 备用字段4
+     */
     @Excel(name = "备用字段4")
     private String spare4;
 
-    /** 备用字段3 */
+    /**
+     * 备用字段3
+     */
     @Excel(name = "备用字段3")
     private String spare3;
 
-    /** 备用字段5 */
+    /**
+     * 备用字段5
+     */
     @Excel(name = "备用字段5")
     private String spare5;
 
@@ -104,6 +141,26 @@ public class InStockin extends BaseEntity
     private String materialDesc;
     private String startDate;
 
+    private String companyShortName;
+    private String accountSetNo;
+
+
+    public String getAccountSetNo() {
+        return accountSetNo;
+    }
+
+    public void setAccountSetNo(String accountSetNo) {
+        this.accountSetNo = accountSetNo;
+    }
+
+    public String getCompanyShortName() {
+        return companyShortName;
+    }
+
+    public void setCompanyShortName(String companyShortName) {
+        this.companyShortName = companyShortName;
+    }
+
     private List<String> typeData;
 
     public String getStartDate() {
@@ -170,193 +227,155 @@ public class InStockin extends BaseEntity
         this.supplierName = supplierName;
     }
 
-    public void setStockinGuid(String stockinGuid)
+    public void setStockinGuid(String stockinGuid) {
-    {
         this.stockinGuid = stockinGuid;
     }
 
-    public String getStockinGuid()
+    public String getStockinGuid() {
-    {
         return stockinGuid;
     }
 
-    public void setStockinId(String stockinId)
+    public void setStockinId(String stockinId) {
-    {
         this.stockinId = stockinId;
     }
 
-    public String getStockinId()
+    public String getStockinId() {
-    {
         return stockinId;
     }
 
-    public void setInType(String inType)
+    public void setInType(String inType) {
-    {
         this.inType = inType;
     }
 
-    public String getInType()
+    public String getInType() {
-    {
         return inType;
     }
 
-    public void setCreateDate(String createDate)
+    public void setCreateDate(String createDate) {
-    {
         this.createDate = createDate;
     }
 
-    public String getCreateDate()
+    public String getCreateDate() {
-    {
         return createDate;
     }
 
-    public void setCreateManId(String createManId)
+    public void setCreateManId(String createManId) {
-    {
         this.createManId = createManId;
     }
 
-    public String getCreateManId()
+    public String getCreateManId() {
-    {
         return createManId;
     }
 
-    public void setStatus(String status)
+    public void setStatus(String status) {
-    {
         this.status = status;
     }
 
-    public String getStatus()
+    public String getStatus() {
-    {
         return status;
     }
 
-    public void setWarehouseId(String warehouseId)
+    public void setWarehouseId(String warehouseId) {
-    {
         this.warehouseId = warehouseId;
     }
 
-    public String getWarehouseId()
+    public String getWarehouseId() {
-    {
         return warehouseId;
     }
 
-    public void setFinishDate(String finishDate)
+    public void setFinishDate(String finishDate) {
-    {
         this.finishDate = finishDate;
     }
 
-    public String getFinishDate()
+    public String getFinishDate() {
-    {
         return finishDate;
     }
 
-    public void setErpBill(String erpBill)
+    public void setErpBill(String erpBill) {
-    {
         this.erpBill = erpBill;
     }
 
-    public String getErpBill()
+    public String getErpBill() {
-    {
         return erpBill;
     }
 
-    public void setStockSource(String stockSource)
+    public void setStockSource(String stockSource) {
-    {
         this.stockSource = stockSource;
     }
 
-    public String getStockSource()
+    public String getStockSource() {
-    {
         return stockSource;
     }
 
-    public void setDepartmentNo(String departmentNo)
+    public void setDepartmentNo(String departmentNo) {
-    {
         this.departmentNo = departmentNo;
     }
 
-    public String getDepartmentNo()
+    public String getDepartmentNo() {
-    {
         return departmentNo;
     }
 
-    public void setCustomerNo(String customerNo)
+    public void setCustomerNo(String customerNo) {
-    {
         this.customerNo = customerNo;
     }
 
-    public String getCustomerNo()
+    public String getCustomerNo() {
-    {
         return customerNo;
     }
 
-    public void setClassNo(String classNo)
+    public void setClassNo(String classNo) {
-    {
         this.classNo = classNo;
     }
 
-    public String getClassNo()
+    public String getClassNo() {
-    {
         return classNo;
     }
 
-    public void setSupplierNo(String supplierNo)
+    public void setSupplierNo(String supplierNo) {
-    {
         this.supplierNo = supplierNo;
     }
 
-    public String getSupplierNo()
+    public String getSupplierNo() {
-    {
         return supplierNo;
     }
 
-    public void setSpare1(String spare1)
+    public void setSpare1(String spare1) {
-    {
         this.spare1 = spare1;
     }
 
-    public String getSpare1()
+    public String getSpare1() {
-    {
         return spare1;
     }
 
-    public void setSpare2(String spare2)
+    public void setSpare2(String spare2) {
-    {
         this.spare2 = spare2;
     }
 
-    public String getSpare2()
+    public String getSpare2() {
-    {
         return spare2;
     }
 
-    public void setSpare4(String spare4)
+    public void setSpare4(String spare4) {
-    {
         this.spare4 = spare4;
     }
 
-    public String getSpare4()
+    public String getSpare4() {
-    {
         return spare4;
     }
 
-    public void setSpare3(String spare3)
+    public void setSpare3(String spare3) {
-    {
         this.spare3 = spare3;
     }
 
-    public String getSpare3()
+    public String getSpare3() {
-    {
         return spare3;
     }
 
-    public void setSpare5(String spare5)
+    public void setSpare5(String spare5) {
-    {
         this.spare5 = spare5;
     }
 
-    public String getSpare5()
+    public String getSpare5() {
-    {
         return spare5;
     }
 

ruoyi-admin/src/main/java/com/ruoyi/in/stockinback/domain/InStockinBack.java

@@ -96,6 +96,25 @@ public class InStockinBack extends BaseEntity
 
     private String msg;
 
+    private String accountSetNo;
+    private String companyShortName;
+
+    public String getAccountSetNo() {
+        return accountSetNo;
+    }
+
+    public void setAccountSetNo(String accountSetNo) {
+        this.accountSetNo = accountSetNo;
+    }
+
+    public String getCompanyShortName() {
+        return companyShortName;
+    }
+
+    public void setCompanyShortName(String companyShortName) {
+        this.companyShortName = companyShortName;
+    }
+
     public String getSendStatus() {
         return sendStatus;
     }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindeatilback/domain/InStockinDetailBack.java

@@ -152,6 +152,44 @@ public class InStockinDetailBack extends BaseEntity
 
     private String msg;
 
+    private String sourceLineId;
+    private String barCode;
+    private String isBatchManage;
+    private String oldProjectNo;
+
+
+    public String getSourceLineId() {
+        return sourceLineId;
+    }
+
+    public void setSourceLineId(String sourceLineId) {
+        this.sourceLineId = sourceLineId;
+    }
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
+    public String getIsBatchManage() {
+        return isBatchManage;
+    }
+
+    public void setIsBatchManage(String isBatchManage) {
+        this.isBatchManage = isBatchManage;
+    }
+
+    public String getOldProjectNo() {
+        return oldProjectNo;
+    }
+
+    public void setOldProjectNo(String oldProjectNo) {
+        this.oldProjectNo = oldProjectNo;
+    }
+
     public String getSendStatus() {
         return sendStatus;
     }

ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/domain/InStockinDetail.java

@@ -18,52 +18,73 @@ import lombok.ToString;
 @AllArgsConstructor
 @NoArgsConstructor
 @ToString
-public class InStockinDetail extends BaseEntity
+public class InStockinDetail extends BaseEntity {
-{
     private static final long serialVersionUID = 1L;
 
-    /** 子单ID */
+    /**
+     * 子单ID
+     */
     private String stockinDetailId;
 
-    /** 主单GUID */
+    /**
+     * 主单GUID
+     */
     @Excel(name = "主单GUID")
     private String stockinGuid;
 
-    /** 主单ID */
+    /**
+     * 主单ID
+     */
     @Excel(name = "主单ID")
     private String stockinId;
 
-    /** 批次号 */
+    /**
+     * 批次号
+     */
     @Excel(name = "批次号")
     private String lotNo;
 
-    /** 物料ID */
+    /**
+     * 物料ID
+     */
     @Excel(name = "物料ID")
     private String productGuid;
 
-    /** 品号 */
+    /**
+     * 品号
+     */
     @Excel(name = "品号")
     private String productId;
     @Excel(name = "品名")
     private String productName;
 
-    /** 计划数量 */
+    /**
+     * 计划数量
+     */
     @Excel(name = "计划数量")
     private String quantity;
 
-    /** 计划数量(箱) */
+    /**
+     * 计划数量(箱)
+     */
     @Excel(name = "计划数量(箱)")
     private String quantityX;
 
-    /** 计划数量(件) */
+    /**
+     * 计划数量(件)
+     */
     @Excel(name = "计划数量(件)")
     private String quantityJ;
 
-    /** 参考单价 */
+    /**
+     * 参考单价
+     */
     @Excel(name = "参考单价")
     private String price;
 
-    /** 品牌 */
+    /**
+     * 品牌
+     */
     @Excel(name = "品牌")
     private String cargoNo;
 
@@ -74,63 +95,93 @@ public class InStockinDetail extends BaseEntity
     @Excel(name = "扫码数量(件)")
     private String scanNumJ;
 
-    /** 实际数量 */
+    /**
+     * 实际数量
+     */
     @Excel(name = "实际数量")
     private String assignNum;
 
-    /** 实际数量(箱) */
+    /**
+     * 实际数量(箱)
+     */
     @Excel(name = "实际数量(箱)")
     private String assignNumX;
 
-    /** 实际数量(件) */
+    /**
+     * 实际数量(件)
+     */
     @Excel(name = "实际数量(件)")
     private String assignNumJ;
 
-    /** 入库日期 */
+    /**
+     * 入库日期
+     */
     @Excel(name = "入库日期")
     private String printDate;
 
-    /** 单据状态 */
+    /**
+     * 单据状态
+     */
     @Excel(name = "单据状态")
     private String stockStatus;
 
-    /** 供应商编码 */
+    /**
+     * 供应商编码
+     */
     @Excel(name = "供应商编码")
     private String supplierId;
 
-    /** 客户编码 */
+    /**
+     * 客户编码
+     */
     @Excel(name = "客户编码")
     private String customerId;
 
-    /** 单位 */
+    /**
+     * 单位
+     */
     @Excel(name = "单位")
     private String unit;
 
-    /** 规格 */
+    /**
+     * 规格
+     */
     @Excel(name = "规格")
     private String spec;
 
-    /** 备用字段1 */
+    /**
+     * 备用字段1
+     */
     @Excel(name = "型号")
     private String spare1;
 
-    /** 备用字段2 */
+    /**
+     * 备用字段2
+     */
     @Excel(name = "净重")
     private String spare2;
 
-    /** 备用字段3 */
+    /**
+     * 备用字段3
+     */
     @Excel(name = "颜色")
     private String spare3;
 
-    /** 备用字段4 */
+    /**
+     * 备用字段4
+     */
     @Excel(name = "序列号")
     private String spare4;
 
-    /** 备用字段5 */
+    /**
+     * 备用字段5
+     */
     @Excel(name = "电压")
     private String spare5;
 
-    /** 备用字段6 */
+    /**
+     * 备用字段6
+     */
     @Excel(name = "功率")
     private String spare6;
     @Excel(name = "相位")
@@ -148,4 +199,11 @@ public class InStockinDetail extends BaseEntity
 
     private String warehouseId;
 
+    private String sourceLineId;
+    private String barCode;
+    private String isBatchManage;
+    private String oldProjectNo;
+
+
+
 }

ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java

@@ -103,6 +103,25 @@ public class OutStockout extends BaseEntity
 
     private String productName;
 
+    private String companyShortName;
+    private String accountSetNo;
+
+    public String getCompanyShortName() {
+        return companyShortName;
+    }
+
+    public void setCompanyShortName(String companyShortName) {
+        this.companyShortName = companyShortName;
+    }
+
+    public String getAccountSetNo() {
+        return accountSetNo;
+    }
+
+    public void setAccountSetNo(String accountSetNo) {
+        this.accountSetNo = accountSetNo;
+    }
+
     private List<String> typeData;
 
     public String getSpare6() {

ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutBack/domain/OutStockoutBack.java

@@ -127,7 +127,26 @@ public class OutStockoutBack extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String msg;
 
-    public void setStockoutGuid(String stockoutGuid) 
+    private String companyShortName;
+    private String accountSetNo;
+
+    public String getCompanyShortName() {
+        return companyShortName;
+    }
+
+    public void setCompanyShortName(String companyShortName) {
+        this.companyShortName = companyShortName;
+    }
+
+    public String getAccountSetNo() {
+        return accountSetNo;
+    }
+
+    public void setAccountSetNo(String accountSetNo) {
+        this.accountSetNo = accountSetNo;
+    }
+
+    public void setStockoutGuid(String stockoutGuid)
     {
         this.stockoutGuid = stockoutGuid;
     }

ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java

@@ -199,7 +199,43 @@ public class OutStockoutDetail extends BaseEntity
     private String spare8;
 
     private String spare9;
+    private String sourceLineId;
+    private String barCode;
+    private String isBatchManage;
 
+    private String oldProjectNo;
+
+    public String getOldProjectNo() {
+        return oldProjectNo;
+    }
+
+    public void setOldProjectNo(String oldProjectNo) {
+        this.oldProjectNo = oldProjectNo;
+    }
+
+    public String getSourceLineId() {
+        return sourceLineId;
+    }
+
+    public void setSourceLineId(String sourceLineId) {
+        this.sourceLineId = sourceLineId;
+    }
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
+    public String getIsBatchManage() {
+        return isBatchManage;
+    }
+
+    public void setIsBatchManage(String isBatchManage) {
+        this.isBatchManage = isBatchManage;
+    }
 
     public String getSpare1() {
         return spare1;

ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetailBack/domain/OutStockoutDetailBack.java

@@ -172,7 +172,44 @@ public class OutStockoutDetailBack extends BaseEntity
     @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
     private String msg;
 
-    public void setStockoutDetailId(String stockoutDetailId) 
+    private String sourceLineId;
+    private String barCode;
+    private String isBatchManage;
+    private String oldProjectNo;
+
+    public String getSourceLineId() {
+        return sourceLineId;
+    }
+
+    public void setSourceLineId(String sourceLineId) {
+        this.sourceLineId = sourceLineId;
+    }
+
+    public String getBarCode() {
+        return barCode;
+    }
+
+    public void setBarCode(String barCode) {
+        this.barCode = barCode;
+    }
+
+    public String getIsBatchManage() {
+        return isBatchManage;
+    }
+
+    public void setIsBatchManage(String isBatchManage) {
+        this.isBatchManage = isBatchManage;
+    }
+
+    public String getOldProjectNo() {
+        return oldProjectNo;
+    }
+
+    public void setOldProjectNo(String oldProjectNo) {
+        this.oldProjectNo = oldProjectNo;
+    }
+
+    public void setStockoutDetailId(String stockoutDetailId)
     {
         this.stockoutDetailId = stockoutDetailId;
     }

ruoyi-admin/src/main/resources/mapper/in/InStockinDetailBackMapper.xml

@@ -42,13 +42,55 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sendStatus"    column="send_status"/>
         <result property="sendTime"   column="send_time"/>
         <result property="msg"     column="msg"/>
+        <result property="sourceLineId"     column="source_line_id"/>
+        <result property="barCode"     column="bar_code"/>
+        <result property="isBatchManage"     column="is_batch_manage"/>
+        <result property="oldProjectNo"     column="old_project_no"/>
     </resultMap>
 
     <sql id="selectInStockinDetailBackVo">
-        select stockin_detail_id, stockin_guid, stockin_id, lot_no, product_guid, product_id, quantity,
+        select stockin_detail_id,
-               quantity_x, quantity_j, price, cargo_no, remark, assign_num, assign_num_x, assign_num_j,
+               stockin_guid,
-               print_date, stock_status, supplier_id, customer_id, unit, spec, spare1, spare2, spare3,
+               stockin_id,
-               spare4, spare5, spare6, scan_num, scan_num_x, scan_num_j, spare7, spare8, spare9, product_name,send_status,send_time,msg from in_stockin_detail_back
+               lot_no,
+               product_guid,
+               product_id,
+               quantity,
+               quantity_x,
+               quantity_j,
+               price,
+               cargo_no,
+               remark,
+               assign_num,
+               assign_num_x,
+               assign_num_j,
+               print_date,
+               stock_status,
+               supplier_id,
+               customer_id,
+               unit,
+               spec,
+               spare1,
+               spare2,
+               spare3,
+               spare4,
+               spare5,
+               spare6,
+               scan_num,
+               scan_num_x,
+               scan_num_j,
+               spare7,
+               spare8,
+               spare9,
+               product_name,
+               send_status,
+               send_time,
+               msg,
+               source_line_id,
+               bar_code,
+               is_batch_manage,
+               old_project_no
+        from in_stockin_detail_back
     </sql>
 
     <select id="selectInStockinDetailBackList" parameterType="InStockinDetailBack" resultMap="InStockinDetailBackResult">

ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml

@@ -143,6 +143,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scanNumX != null">scan_num_x,</if>
             <if test="scanNumJ != null">scan_num_j,</if>
             <if test="productName != null">product_name,</if>
+            <if test="sourceLineId != null">source_line_id,</if>
+            <if test="barCode != null">bar_code,</if>
+            <if test="isBatchManage != null">is_batch_manage,</if>
+            <if test="oldProjectNo != null">old_project_no,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockinDetailId != null">#{stockinDetailId},</if>
@@ -180,6 +184,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="scanNumX != null">#{scanNumX},</if>
             <if test="scanNumJ != null">#{scanNumJ},</if>
             <if test="productName != null">#{productName},</if>
+
+            <if test="sourceLineId != null">#{sourceLineId},</if>
+            <if test="barCode != null">#{barCode},</if>
+            <if test="isBatchManage != null">#{isBatchManage},</if>
+            <if test="oldProjectNo != null">#{oldProjectNo},</if>
+
          </trim>
     </insert>
     <insert id="insertInStockinDetailList">

ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml

@@ -28,6 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="spare4"    column="spare4"    />
         <result property="spare3"    column="spare3"    />
         <result property="spare5"    column="spare5"    />
+        <result property="companyShortName"    column="company_short_name"    />
+        <result property="accountSetNo"    column="account_set_no"    />
     </resultMap>
 
     <sql id="selectInStockinVo">
@@ -138,6 +140,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare4 != null">spare4,</if>
             <if test="spare3 != null">spare3,</if>
             <if test="spare5 != null">spare5,</if>
+            <if test="companyShortName != null">company_short_name,</if>
+            <if test="accountSetNo != null">account_set_no,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockinGuid != null">#{stockinGuid},</if>
@@ -159,6 +163,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare4 != null">#{spare4},</if>
             <if test="spare3 != null">#{spare3},</if>
             <if test="spare5 != null">#{spare5},</if>
+            <if test="company_short_name != null">#{companyShortName},</if>
+            <if test="account_set_no != null">#{accountSetNo},</if>
          </trim>
     </insert>
     <insert id="insertInStockinHistory">
@@ -187,6 +193,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare4 != null">spare4 = #{spare4},</if>
             <if test="spare3 != null">spare3 = #{spare3},</if>
             <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="companyShortName != null">company_short_name = #{companyShortName},</if>
+            <if test="accountSetNo != null">account_set_no = #{accountSetNo},</if>
         </trim>
         where stockin_guid = #{stockinGuid}
     </update>

ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml

@@ -141,6 +141,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare7 != null">spare7,</if>
             <if test="spare8 != null">spare8,</if>
             <if test="spare9 != null">spare9,</if>
+            <if test="sourceLineId != null">source_line_id,</if>
+            <if test="barCode != null">bar_code,</if>
+            <if test="isBatchManage != null">is_batch_manage,</if>
+            <if test="oldProjectNo != null">old_project_no,</if>
 
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -181,6 +185,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="spare7 != null">#{spare7},</if>
         <if test="spare8 != null">#{spare8},</if>
         <if test="spare9 != null">#{spare9},</if>
+        <if test="sourceLineId != null">#{sourceLineId},</if>
+        <if test="barCode != null">#{barCode},</if>
+        <if test="isBatchManage != null">#{isBatchManage},</if>
+        <if test="oldProjectNo != null">#{oldProjectNo},</if>
 </trim>
     </insert>
 

ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml

@@ -107,6 +107,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare6 != null">spare6,</if>
             <if test="spare7 != null">spare7,</if>
             <if test="spare8 != null">spare8,</if>
+            <if test="companyShortName != null">company_short_name,</if>
+            <if test="accountSetNo != null">account_set_no,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockoutGuid != null and stockoutGuid != ''">#{stockoutGuid},</if>
@@ -132,6 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare6 != null">#{spare6},</if>
             <if test="spare7 != null">#{spare7},</if>
             <if test="spare8 != null">#{spare8},</if>
+            <if test="companyShortName != null">#{companyShortName},</if>
+            <if test="accountSetNo != null">#{accountSetNo},</if>
          </trim>
     </insert>
 
@@ -159,6 +163,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="spare4 != null">spare4 = #{spare4},</if>
             <if test="spare3 != null">spare3 = #{spare3},</if>
             <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="companyShortName != null">company_short_name = #{companyShortName},</if>
+            <if test="accountSetNo != null">account_set_no = #{accountSetNo},</if>
         </trim>
         where stockout_guid = #{stockoutGuid}
     </update>

ruoyi-ui/src/views/in/stockIn/index.vue

@@ -21,16 +21,16 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="单据来源" prop="stockSource"><!--单据来源-->
+<!--      <el-form-item label="单据来源" prop="stockSource">&lt;!&ndash;单据来源&ndash;&gt;-->
-        <el-select v-model="queryParams.stockSource" placeholder="请选择单据来源" clearable>
+<!--        <el-select v-model="queryParams.stockSource" placeholder="请选择单据来源" clearable>-->
-          <el-option
+<!--          <el-option-->
-            v-for="dict in dict.type.bill_resource"
+<!--            v-for="dict in dict.type.bill_resource"-->
-            :key="dict.value"
+<!--            :key="dict.value"-->
-            :label="dict.label"
+<!--            :label="dict.label"-->
-            :value="dict.value"
+<!--            :value="dict.value"-->
-          />
+<!--          />-->
-        </el-select>
+<!--        </el-select>-->
-      </el-form-item>
+<!--      </el-form-item>-->
       <el-form-item label="项目号" prop="departmentNo">
       <el-input
         v-model="queryParams.departmentNo"
@@ -39,41 +39,49 @@
         @keyup.enter.native="handleQuery"
       />
     </el-form-item>
-      <el-form-item label="合同号" prop="spare1">
+<!--      <el-form-item label="合同号" prop="spare1">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.spare1"-->
+<!--          placeholder="请输入合同号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="erp单据号" prop="erpBill">
         <el-input
-          v-model="queryParams.spare1"
+          v-model="queryParams.erpBill"
-          placeholder="请输入合同号"
+          placeholder="请输入erp单据号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="销售订单号" prop="spare2">
-        <el-input
-          v-model="queryParams.spare2"
-          placeholder="请输入销售订单号"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
-      <el-form-item label="存货名称" prop="materialDesc"><!--品名-->
+      <el-form-item label="存货名称" prop="productName"><!--品名-->
         <el-input
-          v-model="queryParams.materialDesc"
+          v-model="queryParams.productName"
           placeholder="请输入存货名称"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
+      <el-form-item label="存货编码" prop="productId"><!--品名-->
-      <el-form-item label="批次号" prop="lotNo"><!--品名-->
         <el-input
-          v-model="queryParams.lotNo"
+          v-model="queryParams.productId"
-          placeholder="请输入批次号"
+          placeholder="请输入存货编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
 
+<!--      <el-form-item label="批次号" prop="lotNo">&lt;!&ndash;品名&ndash;&gt;-->
+<!--        <el-input-->
+<!--          v-model="queryParams.lotNo"-->
+<!--          placeholder="请输入批次号"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+
       <el-form-item :label="'单据时间'" prop="dateRange">
         <el-date-picker
           v-model="dateRange"
@@ -172,6 +180,7 @@
       <el-table-column type="selection" width="55" align="center"/>
       <el-table-column label="GUID" align="center" prop="stockinGuid" v-if="false"/>
       <el-table-column label="入库单据号" align="left" prop="stockinId" width="150" sortable/><!--入库订单-->
+      <el-table-column label="erp单据号" align="left" prop="erpBill" width="150" sortable/><!--入库订单-->
       <el-table-column label="单据类型" align="left" prop="inType"><!--入库类型-->
         <template slot-scope="scope">
           <dict-tag :options="dict.type.in_bill_type" :value="scope.row.inType"/>
@@ -211,19 +220,23 @@
 
     <el-table v-loading="detailLoading" :data="stockInDetailList" @selection-change="handleDetailSelectionChange">
       <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="子单ID" align="left" prop="stockinDetailId" width="160" sortable/><!--子单ID-->
+      <el-table-column label="子单ID" align="left" prop="stockinDetailId" width="160" /><!--子单ID-->
       <el-table-column label="主单ID" align="left" prop="stockinId" width="160"/><!--主单ID-->
-      <el-table-column label="存货编码" align="left" prop="productId" sortable/><!--品号-->
+      <el-table-column label="存货编码" align="left" prop="productId" /><!--品号-->
       <el-table-column label="存货名称" align="left" prop="productName" width="160"/><!--品号-->
-      <el-table-column label="批号" align="left" prop="lotNo" sortable/><!--批号-->
+      <el-table-column label="批号" align="left" prop="lotNo" /><!--批号-->
       <el-table-column label="单位" align="left" prop="unit"/><!--机型-->
       <el-table-column label="规格型号" align="left" prop="spec"/><!--规格-->
       <el-table-column label="层级关系" align="left" prop="spare1"/><!--型号-->
       <el-table-column label="上层物料" align="left" prop="spare2"/><!--净重-->
       <el-table-column label="顶层物料" align="left" prop="spare3"/><!--颜色-->
-      <el-table-column label="计划数量" align="left" prop="quantity" sortable/><!--计划数量-->
+      <el-table-column label="计划数量" align="left" prop="quantity" /><!--计划数量-->
-      <el-table-column label="扫码数量" align="left" prop="scanNum" sortable/><!--扫码数量-->
+      <el-table-column label="扫码数量" align="left" prop="scanNum" /><!--扫码数量-->
-      <el-table-column label="实际数量" align="left" prop="assignNum" sortable/><!--实际数量-->
+      <el-table-column label="实际数量" align="left" prop="assignNum" /><!--实际数量-->
+      <el-table-column label="货位号" align="left" prop="assignNum" /><!--实际数量-->
+      <el-table-column label="托盘号" align="left" prop="assignNum" /><!--实际数量-->
+      <el-table-column label="条码号" align="left" prop="assignNum" /><!--实际数量-->
+      <el-table-column label="采购订单" align="left" prop="assignNum" /><!--实际数量-->
 
     </el-table>
     <pagination

ruoyi-ui/src/views/out/outStockoutManage.vue

@@ -2,21 +2,21 @@
   <div class="app-container">
     <!-- 查询表单 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item :label="'仓库'" prop="warehouseId"><!--仓库-->
+<!--      <el-form-item :label="'仓库'" prop="warehouseId">&lt;!&ndash;仓库&ndash;&gt;-->
-        <el-select
+<!--        <el-select-->
-          v-model="queryParams.warehouseId"
+<!--          v-model="queryParams.warehouseId"-->
-          :placeholder="'请选择仓库'"
+<!--          :placeholder="'请选择仓库'"-->
-          clearable
+<!--          clearable-->
-          @change="handleQuery"
+<!--          @change="handleQuery"-->
-        >
+<!--        >-->
-          <el-option
+<!--          <el-option-->
-            v-for="item in warehouseOptions"
+<!--            v-for="item in warehouseOptions"-->
-            :key="item.warehouseId"
+<!--            :key="item.warehouseId"-->
-            :label="item.warehouseName"
+<!--            :label="item.warehouseName"-->
-            :value="item.warehouseId"
+<!--            :value="item.warehouseId"-->
-          />
+<!--          />-->
-        </el-select>
+<!--        </el-select>-->
-      </el-form-item>
+<!--      </el-form-item>-->
       <el-form-item :label="'出库单编号'" prop="stockoutId"> <!-- 出库单编号 -->
         <el-input
           v-model="queryParams.stockoutId"
@@ -25,6 +25,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item :label="'erp单据号'" prop="erpStockOutId"> <!-- 出库单编号 -->
+        <el-input
+          v-model="queryParams.erpStockOutId"
+          :placeholder="'请输入出库单编号'"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item :label="'出库类型'" prop="outType"> <!-- 出库类型 -->
         <el-select v-model="queryParams.outType" :placeholder="'请选择出库类型'" clearable>
           <el-option
@@ -45,10 +53,18 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item :label="'客商名称'" prop="customerName">
+<!--      <el-form-item :label="'客商名称'" prop="customerName">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.customerName"-->
+<!--          :placeholder="'请输入客商名称'"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item :label="'存货编码'" prop="productId">
         <el-input
-          v-model="queryParams.customerName"
+          v-model="queryParams.productId"
-          :placeholder="'请输入客商名称'"
+          :placeholder="'请输入存货编码'"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -137,6 +153,7 @@
     <el-table v-loading="loading" :data="outStockoutList" @selection-change="handleSelectionChange" @row-click="handleRowClick" max-height="400">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column :label="'出库单编号'" align="left" prop="stockoutId" />
+      <el-table-column :label="'erp单据号'" align="left" prop="erpStockOutId" />
       <el-table-column :label="'出库类型'" align="left" prop="outType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.out_bill_type" :value="scope.row.outType"/>
@@ -188,7 +205,7 @@
       <el-table-column :label="'存货编码'" align="center" prop="productId" sortable/>
       <el-table-column :label="'存货名称'" align="center" prop="productName" />
       <el-table-column :label="'批次号'" align="center" prop="lotNo"/>
-      <el-table-column :label="'供应商编码'" align="center" prop="fid"/>
+<!--      <el-table-column :label="'供应商编码'" align="center" prop="fid"/>-->
       <el-table-column :label="'计量单位'" align="center" prop="unit"/>
       <el-table-column :label="'规格型号'" align="center" prop="spec"/>
       <el-table-column :label="'层次关系'" align="center" prop="spare1"/>
@@ -200,6 +217,9 @@
       <el-table-column :label="'出库数量'" align="center" prop="quantity"/>
       <el-table-column :label="'分配数量'" align="center" prop="allotQuantity"/>
       <el-table-column :label="'实际数量'" align="center" prop="assignNum"/>
+      <el-table-column :label="'货位号'" align="center" prop="cargoSpaceId"/>
+      <el-table-column :label="'托盘号'" align="center" prop="trayCode"/>
+      <el-table-column :label="'条码号'" align="center" prop="trayCode"/>
       <!--      <el-table-column :label="'备注'" align="center" prop="remark"/>-->
     </el-table>
 
@@ -393,6 +413,7 @@ export default {
         pageNum: 1,
         pageSize: 10,
         stockoutId: null,
+        erpStockOutId:null,
         outType: null,
         customerNo: null,
         customerName: null,

ruoyi-ui/src/views/stock/management/index.vue

@@ -25,6 +25,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="托盘条码" prop="trayCode"><!-- 货位id -->
+        <el-input
+          v-model="queryParams.trayCode"
+          placeholder="请输入托盘条码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="库存状态" prop="stockStatus"><!-- 库存状态 -->
         <el-select v-model="queryParams.stockStatus" placeholder="请选择库存状态" clearable>
           <el-option
@@ -110,7 +118,7 @@
       <el-table-column width="180"  label="物料编码" align="left" prop="productId" />
       <el-table-column width="180"  label="物料名称" align="left" prop="productName" />
       <el-table-column width="180"  label="批次号" align="left" prop="lotNo"  />
-<!--      <el-table-column label="订单号" align="center" prop="orderId" width="160" sortable/>-->
+      <el-table-column label="托盘条码" align="center" prop="trayCode" width="160" sortable/>
       <el-table-column width="180" label="入库时间" align="left" prop="inDate"  sortable/>
       <el-table-column width="100" label="数量" align="left" prop="quantity" sortable/>
       <el-table-column width="180" label="作业ID" align="left" prop="jobId"  sortable/>

ruoyi-ui/src/views/stock/pointOut.vue

@@ -17,6 +17,14 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="托盘条码" prop="trayCode"><!-- 品名 -->
+        <el-input
+          v-model="queryParams.trayCode"
+          placeholder="请输入托盘条码"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
       <el-form-item label="项目号" prop="spare4"><!-- 品名 -->
         <el-input
           v-model="queryParams.spare4"

ruoyi-ui/vue.config.js

@@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 
 const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
 
-const baseUrl = 'http://192.168.188.236:8080' // 后端接口
+const baseUrl = 'http://127.0.0.1:8080' // 后端接口
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口