diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java
index 3f6f70d..7f42882 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/controller/ToErpApiController.java
@@ -2,6 +2,7 @@ package com.ruoyi.api.controller;
 
 import com.ruoyi.api.service.IToErpService;
 import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.log.service.IRequestLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -16,13 +17,21 @@ public class ToErpApiController {
 
     @Autowired
     private IToErpService toErpService;
+    @Autowired
+    private IRequestLogService requestLogService;
 
     /**
      * 接收入出库通知单
      */
     @PostMapping("/receiveDeliveryNotice")
+    @ResponseBody
     public AjaxResult receiveDeliveryNotice(@RequestBody DeliveryNoticeVo deliveryNoticeVo) {
-        return toErpService.receiveDeliveryNotice(deliveryNoticeVo);
+
+        AjaxResult ajaxResult = toErpService.receiveDeliveryNotice(deliveryNoticeVo);
+        requestLogService.insertRequestLog(requestLogService.getRequestLog(deliveryNoticeVo.toString(), "接收入出库通知单", ajaxResult));
+        return ajaxResult;
+
+
     }
 
 
@@ -30,7 +39,9 @@ public class ToErpApiController {
      * 回传其他出入库单
      */
 //    @Scheduled(fixedDelay = 1500)
-    public void callbackTransferBill() {
-        toErpService.callbackTransferBill();
+    @RequestMapping("/callbackDeliveryNotice")
+    @ResponseBody
+    public AjaxResult callbackDeliveryNotice(String billNo) {
+       return toErpService.callbackDeliveryNotice(billNo);
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java
index 1264a65..52bb862 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/domain/DeliveryNoticeItemVo.java
@@ -13,8 +13,12 @@ import lombok.ToString;
 @NoArgsConstructor
 @ToString
 public class DeliveryNoticeItemVo {
+
+
     /** 行号 */
     private String lineNo;
+    /** 单据号 */
+    private String billNo;
     /** 存货编码 */
     private String inventoryCode;
     /** 存货名称 */
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java
index f1999d0..8859608 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/IToErpService.java
@@ -12,7 +12,7 @@ public interface IToErpService {
     AjaxResult receiveDeliveryNotice(DeliveryNoticeVo deliveryNoticeVo);
 
 
-    void callbackTransferBill();
+    AjaxResult callbackDeliveryNotice(String billNo);
 
     AjaxResult createWorkshopInboundOrder(BasProduct basProduct);
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
index 605843e..ba58eff 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToErpServiceImpl.java
@@ -14,6 +14,8 @@ import com.ruoyi.in.stockin.domain.InStockin;
 import com.ruoyi.in.stockin.service.IInStockinService;
 import com.ruoyi.in.stockindetail.domain.InStockinDetail;
 import com.ruoyi.in.stockindetail.service.IInStockinDetailService;
+import com.ruoyi.in.stockinfinish.domain.InStockinFinish;
+import com.ruoyi.in.stockinfinish.service.IInStockinFinishService;
 import com.ruoyi.job.mydojob.service.IMydoJobService;
 import com.ruoyi.job.mydojobdetail.domain.MydoJobDetail;
 import com.ruoyi.job.mydojobdetail.service.IMydoJobDetailService;
@@ -25,7 +27,9 @@ import com.ruoyi.out.outStockoutDetail.domain.OutStockoutDetail;
 import com.ruoyi.out.outStockoutDetail.service.IOutStockoutDetailService;
 import com.ruoyi.out.outStockoutDetail.mapper.OutStockoutDetailMapper;
 import com.ruoyi.out.outStockout.mapper.OutStockoutMapper;
+import io.swagger.v3.oas.models.security.SecurityScheme;
 import org.apache.pdfbox.pdmodel.interactive.viewerpreferences.PDViewerPreferences;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -65,6 +69,9 @@ public class ToErpServiceImpl implements IToErpService {
     @Autowired
     private IOutStockoutDetailService outStockoutDetailService;
 
+    @Autowired
+    private IInStockinFinishService inStockinFinishService;
+
     private static final String TO_ERP_URL = "http://192.168.1.100:8080/api/";
 
     //todo 需要调试
@@ -119,6 +126,9 @@ public class ToErpServiceImpl implements IToErpService {
                 if ("2".equals(opType) && exist == null) {
                     return AjaxResult.error("单据不存在，无法修改");
                 }
+                if("1".equals(opType) && exist != null){
+                    return AjaxResult.error("单据已存在，请勿重复添加");
+                }
                 if (exist != null && "3".equals(exist.getStatus()) && "2".equals(opType)) {
                     return AjaxResult.error("单据已执行，禁止修改");
                 }
@@ -149,8 +159,8 @@ public class ToErpServiceImpl implements IToErpService {
                     inStockinDetailService.deleteInStockinDetailByStockinGuid(inStockin.getStockinGuid());
                 }
                 List<DeliveryNoticeItemVo> items = deliveryNoticeVo.getDetailList();
-                List<InStockinDetail> detailList = new ArrayList<>();
-                int i = 1;
+
+
                 for (DeliveryNoticeItemVo item : items) {
                     InStockinDetail detail = new InStockinDetail();
                     detail.setStockinGuid(inStockin.getStockinGuid());
@@ -162,13 +172,16 @@ public class ToErpServiceImpl implements IToErpService {
                     detail.setUnit(item.getUnit());
                     detail.setQuantity(item.getQuantity());
                     detail.setLotNo(item.getLotNo());
-                    detail.setStockStatus("0");
+                    detail.setSpare1(item.getLevelRelation());
+                    detail.setSpare2(item.getUpperMaterial());
+                    detail.setSpare3(item.getTopMaterial());
+                    detail.setRemark(item.getRemark());
                     detail.setAssignNum("0");
                     detail.setScanNum("0");
-                    detailList.add(detail);
-                    i++;
+                    inStockinDetailService.insertInStockinDetail(detail);
+
                 }
-                inStockinDetailService.insertInStockinDetailList(detailList);
+
                 return AjaxResult.success();
             }
         }
@@ -182,14 +195,14 @@ public class ToErpServiceImpl implements IToErpService {
             // 删除操作（操作类型3）
             if ("3".equals(opType)) {
                 if (exist == null) {
-                    return AjaxResult.success();
+                    return AjaxResult.error("单据不存在");
                 }
                 if ("3".equals(exist.getStatus())) {
-                    return AjaxResult.error("单据已完成，禁止删除");
+                    return AjaxResult.error("单据已执行，禁止删除");
                 }
-                OutStockoutDetail q = new OutStockoutDetail();
-                q.setStockoutId(deliveryNoticeVo.getBillNo());
-                List<OutStockoutDetail> details = outStockoutDetailService.selectOutStockoutDetailList(q);
+                OutStockoutDetail outStockoutDetail = new OutStockoutDetail();
+                outStockoutDetail.setStockoutId(deliveryNoticeVo.getBillNo());
+                List<OutStockoutDetail> details = outStockoutDetailService.selectOutStockoutDetailList(outStockoutDetail);
                 if (details != null && !details.isEmpty()) {
                     String[] ids = details.stream().map(OutStockoutDetail::getStockoutDetailId).toArray(String[]::new);
                     outStockoutDetailService.deleteOutStockoutDetailByStockoutDetailIds(ids);
@@ -203,15 +216,19 @@ public class ToErpServiceImpl implements IToErpService {
                 if ("2".equals(opType) && exist == null) {
                     return AjaxResult.error("单据不存在，无法修改");
                 }
-                if (exist != null && "3".equals(exist.getStatus())) {
-                    return AjaxResult.error("单据已完成，禁止修改");
+                if ("1".equals(opType) && exist != null){
+                    return AjaxResult.error("单据已存在，请勿重复添加");
+                }
+                if (exist != null && "3".equals(exist.getStatus()) && "2".equals(opType) ) {
+                    return AjaxResult.error("单据已执行，禁止修改");
                 }
                 OutStockout out = exist != null ? exist : new OutStockout();
+
                 if (exist == null) {
                     out.setStockoutGuid(UUID.randomUUID().toString());
                 }
                 out.setStockoutId(deliveryNoticeVo.getBillNo());
-                out.setOutType(deliveryNoticeVo.getOutType());
+                out.setOutType(deliveryNoticeVo.getBillType());
                 out.setCreateDate(deliveryNoticeVo.getBillDate());
                 out.setCreateManId(deliveryNoticeVo.getCreateMan());
                 out.setStatus("1");
@@ -219,6 +236,13 @@ public class ToErpServiceImpl implements IToErpService {
                 out.setStockoutSource("1");
                 out.setDepartmentNo(deliveryNoticeVo.getProjectNo());
                 out.setCustomerNo(deliveryNoticeVo.getCustomerId());
+                out.setClassNowId(deliveryNoticeVo.getCustomerName());
+                out.setSpare1(deliveryNoticeVo.getContractNo());//合同号
+                out.setSpare2(deliveryNoticeVo.getSalesOrderNo());//销售订单号
+                out.setSpare3(deliveryNoticeVo.getApproveDate());//审核时间
+                out.setSpare4(deliveryNoticeVo.getApproveMan());//审核人
+                out.setSpare5(deliveryNoticeVo.getRemark());
+
                 if (exist == null) {
                     outStockoutService.insertOutStockout(out);
                 } else {
@@ -231,22 +255,32 @@ public class ToErpServiceImpl implements IToErpService {
                         outStockoutDetailService.deleteOutStockoutDetailByStockoutDetailIds(ids);
                     }
                 }
-                int i = 1;
+
                 for (DeliveryNoticeItemVo item : deliveryNoticeVo.getDetailList()) {
                     OutStockoutDetail d = new OutStockoutDetail();
-                    String line = item.getLineNo() != null ? item.getLineNo() : String.valueOf(i);
-                    d.setStockoutDetailId(out.getStockoutId()+"-"+line);
+
+                    d.setStockoutDetailId(item.getLineNo());
                     d.setStockoutGuid(out.getStockoutGuid());
                     d.setStockoutId(out.getStockoutId());
                     d.setProductId(item.getInventoryCode());
+                    d.setProductId(item.getInventoryCode());
                     d.setLotNo(item.getLotNo());
+                    d.setSpec(item.getSpecModel());
+                    d.setUnit(item.getUnit());
+                    d.setSpare1(item.getLevelRelation());
+                    d.setSpare2(item.getUpperMaterial());
+                    d.setSpare3(item.getTopMaterial());
+                    d.setRemark(item.getRemark());
+
                     try {
                         d.setQuantity(new BigDecimal(item.getQuantity()));
+                        d.setAllotQuantity(BigDecimal.ZERO);
+                        d.setAssignNum(BigDecimal.ZERO);
                     } catch (Exception e) {
                         d.setQuantity(BigDecimal.ZERO);
                     }
                     outStockoutDetailService.insertOutStockoutDetail(d);
-                    i++;
+
                 }
                 return AjaxResult.success();
             }
@@ -257,19 +291,63 @@ public class ToErpServiceImpl implements IToErpService {
 
 
     @Override
-    public void callbackTransferBill() {
-        TransferBillCallback param = new TransferBillCallback();
-        param.setStatus("0");
-        List<TransferBillCallback> list = transferBillCallbackService.selectTransferBillCallbackList(param);
-        for (TransferBillCallback transferBillCallback : list) {
-            //todo 请求其他出入库单回传接口
-            AjaxResult otherInOutboundOrder = createOtherInOutboundOrder(transferBillCallback);
-            if (otherInOutboundOrder.isSuccess()){
-                transferBillCallback.setStatus("1");
-                transferBillCallback.setFinishTime(DateUtil.formatDateTime(new Date()));
-                transferBillCallbackService.updateTransferBillCallback(transferBillCallback);
+    public AjaxResult callbackDeliveryNotice(String billNo) {
+        InStockin inStockin = null;
+
+        inStockin = inStockinService.selectInStockinByStockinId(billNo);
+        if(inStockin==null) {
+            InStockinFinish inStockinFinish = inStockinFinishService.selectInStockinFinishByStockinId(billNo);
+
+            if (inStockinFinish == null) {
+                return AjaxResult.error("单据不存在");
+            }else{
+                //将inStockinFinish对象中的所有值赋给inStockin
+                inStockin = new InStockin();
+                BeanUtils.copyProperties(inStockinFinish, inStockin);
             }
         }
+        
+        DeliveryNoticeVo deliveryNoticeVo = new DeliveryNoticeVo();
+        deliveryNoticeVo.setBillNo(inStockin.getStockinId());
+        deliveryNoticeVo.setBillType(inStockin.getInType());
+        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());
+
+        InStockinDetail inStockinDetailParam = new InStockinDetail();
+        inStockinDetailParam.setStockinId(billNo);
+        List<InStockinDetail> inStockinDetails = inStockinDetailService.selectInStockinDetailList(inStockinDetailParam);
+        
+        List<DeliveryNoticeItemVo> detailList = new ArrayList<>();
+        if (inStockinDetails != null && !inStockinDetails.isEmpty()) {
+            for (InStockinDetail detail : inStockinDetails) {
+                DeliveryNoticeItemVo item = new DeliveryNoticeItemVo();
+                item.setLineNo(detail.getStockinDetailId());
+                item.setBillNo(detail.getStockinId());
+                item.setInventoryCode(detail.getProductId());
+                item.setInventoryName(detail.getProductName());
+                item.setSpecModel(detail.getSpec());
+                item.setUnit(detail.getUnit());
+                item.setQuantity(detail.getAssignNum());
+                item.setLotNo(detail.getLotNo());
+                item.setLevelRelation(detail.getSpare1());
+                item.setUpperMaterial(detail.getSpare2());
+                item.setTopMaterial(detail.getSpare3());
+                item.setRemark(detail.getRemark());
+                detailList.add(item);
+            }
+        }
+        deliveryNoticeVo.setDetailList(detailList);
+
+        return AjaxResult.success(deliveryNoticeVo);
     }
 
     @Override
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
index 048ef4f..967dda8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
@@ -43,7 +43,7 @@ public class ToWcsServiceImpl implements IToWcsService {
 
 
     @Override
-    @Scheduled(fixedDelay=1500)
+//    @Scheduled(fixedDelay=1500)
     public void pushOutMydoJob() {
         //查询所有未推送的料箱出库作业
         MydoJob mydoJobParam = new MydoJob();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/mapper/InStockinMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/mapper/InStockinMapper.java
index 8f5b652..3be6e24 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/mapper/InStockinMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/mapper/InStockinMapper.java
@@ -20,6 +20,9 @@ public interface InStockinMapper
      */
     public InStockin selectInStockinByStockinGuid(String stockinGuid);
 
+
+    public InStockin selectInStockinByStockinId(String stockinId);
+
     /**
      * 查询入库单据列表
      *
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java
index 6d1c8e1..6ceece1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/IInStockinService.java
@@ -21,6 +21,7 @@ public interface IInStockinService
      * @return 入库单据
      */
     public InStockin selectInStockinByStockinGuid(String stockinGuid);
+    public InStockin selectInStockinByStockinId(String stockinId);
 
     /**
      * 查询入库单据列表
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
index 508d469..9418000 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockin/service/impl/InStockinServiceImpl.java
@@ -50,6 +50,11 @@ public class InStockinServiceImpl implements IInStockinService
         return inStockinMapper.selectInStockinByStockinGuid(stockinGuid);
     }
 
+    @Override
+    public InStockin selectInStockinByStockinId(String stockinId) {
+        return inStockinMapper.selectInStockinByStockinId(stockinId);
+    }
+
     /**
      * 查询入库单据列表
      *
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java
index ee2d0ee..f80c475 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/mapper/InStockinFinishMapper.java
@@ -20,6 +20,7 @@ public interface InStockinFinishMapper
      * @return 历史入库单据主信息
      */
     public InStockinFinish selectInStockinFinishByStockinGuid(String stockinGuid);
+    public InStockinFinish selectInStockinFinishByStockinId(String stockinId);
 
     /**
      * 查询历史入库单据主信息列表
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java
index 34cd6b2..ededdfc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/IInStockinFinishService.java
@@ -20,6 +20,7 @@ public interface IInStockinFinishService
      * @return 历史入库单据主信息
      */
     public InStockinFinish selectInStockinFinishByStockinGuid(String stockinGuid);
+    public InStockinFinish selectInStockinFinishByStockinId(String stockinId);
 
     /**
      * 查询历史入库单据主信息列表
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java
index d6bef4c..ad28711 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/in/stockinfinish/service/impl/InStockinFinishServiceImpl.java
@@ -34,6 +34,13 @@ public class InStockinFinishServiceImpl implements IInStockinFinishService
         return inStockinFinishMapper.selectInStockinFinishByStockinGuid(stockinGuid);
     }
 
+
+    @Override
+    public InStockinFinish selectInStockinFinishByStockinId(String stockinId)
+    {
+        return inStockinFinishMapper.selectInStockinFinishByStockinId(stockinId);
+    }
+
     /**
      * 查询历史入库单据主信息列表
      *
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java
index cf4ef50..f605af0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java
@@ -62,11 +62,9 @@ public class RequestLogServiceImpl implements IRequestLogService
     @Override
     public int insertRequestLog(RequestLog requestLog)
     {
-        if (requestLog.getIsSuccessful().equals("1")){
+
             return requestLogMapper.insertRequestLog(requestLog);
-        }else {
-            return 0;
-        }
+
     }
 
     /**
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
index 052d271..8403648 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
@@ -82,6 +82,15 @@ public class OutStockout extends BaseEntity
 
     @Excel(name = "确认时间")
     private String finishDate;
+    private String spare1;
+
+    private String spare2;
+
+    private String spare3;
+
+    private String spare4;
+
+    private String spare5;
 
     private String customerName;
 
@@ -299,24 +308,76 @@ public class OutStockout extends BaseEntity
         return erpStockoutId;
     }
 
+    public String getSpare1() {
+        return spare1;
+    }
+
+    public void setSpare1(String spare1) {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare2() {
+        return spare2;
+    }
+
+    public void setSpare2(String spare2) {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare3() {
+        return spare3;
+    }
+
+    public void setSpare3(String spare3) {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare4() {
+        return spare4;
+    }
+
+    public void setSpare4(String spare4) {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare5() {
+        return spare5;
+    }
+
+    public void setSpare5(String spare5) {
+        this.spare5 = spare5;
+    }
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("stockoutGuid", getStockoutGuid())
-            .append("stockoutId", getStockoutId())
-            .append("outType", getOutType())
-            .append("createDate", getCreateDate())
-            .append("departmentNo", getDepartmentNo())
-            .append("customerNo", getCustomerNo())
-            .append("createManId", getCreateManId())
-            .append("status", getStatus())
-            .append("stockoutSource", getStockoutSource())
-            .append("warehouseId", getWarehouseId())
-            .append("classNowId", getClassNowId())
-            .append("exitId", getExitId())
-            .append("carNumber", getCarNumber())
-            .append("FID", getFID())
-            .append("erpStockoutId", getErpStockoutId())
-            .toString();
+        return "OutStockout{" +
+                "stockoutGuid='" + stockoutGuid + '\'' +
+                ", stockoutId='" + stockoutId + '\'' +
+                ", outType='" + outType + '\'' +
+                ", createDate='" + createDate + '\'' +
+                ", departmentNo='" + departmentNo + '\'' +
+                ", customerNo='" + customerNo + '\'' +
+                ", createManId='" + createManId + '\'' +
+                ", status='" + status + '\'' +
+                ", stockoutSource='" + stockoutSource + '\'' +
+                ", warehouseId='" + warehouseId + '\'' +
+                ", classNowId='" + classNowId + '\'' +
+                ", exitId='" + exitId + '\'' +
+                ", carNumber='" + carNumber + '\'' +
+                ", FID='" + FID + '\'' +
+                ", erpStockoutId='" + erpStockoutId + '\'' +
+                ", startDate='" + startDate + '\'' +
+                ", finishDate='" + finishDate + '\'' +
+                ", spare1='" + spare1 + '\'' +
+                ", spare2='" + spare2 + '\'' +
+                ", spare3='" + spare3 + '\'' +
+                ", spare4='" + spare4 + '\'' +
+                ", spare5='" + spare5 + '\'' +
+                ", customerName='" + customerName + '\'' +
+                ", warehouseName='" + warehouseName + '\'' +
+                ", productId='" + productId + '\'' +
+                ", productName='" + productName + '\'' +
+                ", typeData=" + typeData +
+                '}';
     }
 }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java
index f6b3843..4027dd2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/domain/OutStockoutDetail.java
@@ -171,6 +171,108 @@ public class OutStockoutDetail extends BaseEntity
     @Excel(name = "订单号")
     private String orderId;
 
+    @Excel(name = "型号")
+    private String spare1;
+
+    /** 备用字段2 */
+    @Excel(name = "净重")
+    private String spare2;
+
+    /** 备用字段3 */
+    @Excel(name = "颜色")
+    private String spare3;
+
+    /** 备用字段4 */
+    @Excel(name = "序列号")
+    private String spare4;
+
+    /** 备用字段5 */
+    @Excel(name = "电压")
+    private String spare5;
+
+    /** 备用字段6 */
+    @Excel(name = "功率")
+    private String spare6;
+    @Excel(name = "相位")
+    private String spare7;
+    @Excel(name = "毛重")
+    private String spare8;
+
+    private String spare9;
+
+
+    public String getSpare1() {
+        return spare1;
+    }
+
+    public void setSpare1(String spare1) {
+        this.spare1 = spare1;
+    }
+
+    public String getSpare2() {
+        return spare2;
+    }
+
+    public void setSpare2(String spare2) {
+        this.spare2 = spare2;
+    }
+
+    public String getSpare3() {
+        return spare3;
+    }
+
+    public void setSpare3(String spare3) {
+        this.spare3 = spare3;
+    }
+
+    public String getSpare4() {
+        return spare4;
+    }
+
+    public void setSpare4(String spare4) {
+        this.spare4 = spare4;
+    }
+
+    public String getSpare5() {
+        return spare5;
+    }
+
+    public void setSpare5(String spare5) {
+        this.spare5 = spare5;
+    }
+
+    public String getSpare6() {
+        return spare6;
+    }
+
+    public void setSpare6(String spare6) {
+        this.spare6 = spare6;
+    }
+
+    public String getSpare7() {
+        return spare7;
+    }
+
+    public void setSpare7(String spare7) {
+        this.spare7 = spare7;
+    }
+
+    public String getSpare8() {
+        return spare8;
+    }
+
+    public void setSpare8(String spare8) {
+        this.spare8 = spare8;
+    }
+
+    public String getSpare9() {
+        return spare9;
+    }
+
+    public void setSpare9(String spare9) {
+        this.spare9 = spare9;
+    }
+
     public String getVoltage() {
         return voltage;
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/service/impl/OutStockoutDetailServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/service/impl/OutStockoutDetailServiceImpl.java
index bae467f..8dd0960 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/service/impl/OutStockoutDetailServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutDetail/service/impl/OutStockoutDetailServiceImpl.java
@@ -54,7 +54,7 @@ public class OutStockoutDetailServiceImpl implements IOutStockoutDetailService
     @Override
     public int insertOutStockoutDetail(OutStockoutDetail outStockoutDetail)
     {
-        outStockoutDetail.setCreateTime(DateUtils.getNowDate());
+//        outStockoutDetail.setCreateTime(DateUtils.getNowDate());
         return outStockoutDetailMapper.insertOutStockoutDetail(outStockoutDetail);
     }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
index 27a5d56..1a34114 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java
@@ -107,7 +107,10 @@ public class PdaServiceImp implements PdaService {
 
     @Override
     public AjaxResult confirmIn(String trayCode) {
-        //如果有出库作业，修改作业类型改为合盘入库类型
+        //如果有出库作业，修改作业类型改为合盘入库类型,合盘出库放历史表
+
+
+
         //如果没有出库作业，正常生成入库作业
         return null;
     }
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml
index faf7b44..8a9d58d 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailFinishMapper.xml
@@ -94,7 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status,
             isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
             isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
-            bp.product_name,
+            isd.product_name,
             isd.spare7,isd.spare8,isd.spare9
         from in_stockin_detail_finish isd
                  left join bas_product bp on bp.product_id = isd.product_id
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
index 59f283f..09af314 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinDetailMapper.xml
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             isd.assign_num, isd.assign_num_x, isd.assign_num_j, isd.print_date, isd.stock_status,
             isd.supplier_id, isd.customer_id, isd.unit, isd.spec, isd.spare1, isd.spare2, isd.spare3, isd.spare4,
             isd.spare5, isd.spare6, isd.scan_num, isd.scan_num_x, isd.scan_num_j,
-            bp.product_name,
+            isd.product_name,
             isd.spare7,isd.spare8,isd.spare9
         from in_stockin_detail isd
         left join bas_product bp on bp.product_id = isd.product_id
@@ -138,7 +138,7 @@ 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="spec != null">spec,</if>
+
             <if test="scanNum != null">scan_num,</if>
             <if test="scanNumX != null">scan_num_x,</if>
             <if test="scanNumJ != null">scan_num_j,</if>
@@ -174,7 +174,7 @@ 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="spec != null">#{spec},</if>
+
             <if test="scanNum != null">#{scanNum},</if>
             <if test="scanNumX != null">#{scanNumX},</if>
             <if test="scanNumJ != null">#{scanNumJ},</if>
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
index 2a5fb9f..905294c 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinFinishMapper.xml
@@ -110,6 +110,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectInStockinFinishVo"/>
         where is2.stockin_guid = #{stockinGuid}
     </select>
+
+    <select id="selectInStockinFinishByStockinId" parameterType="String" resultMap="InStockinFinishResult">
+        <include refid="selectInStockinFinishVo"/>
+        where is2.stockin_id = #{stockinId}
+    </select>
+
+
     <select id="selectInStockinFinishListByInStockin" resultMap="InStockinResult">
         <include refid="selectInStockinFinishVo"/>
         <where>
@@ -135,7 +142,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and is2.stockin_id in (
                 select distinct stockin_id from in_stockin_detail_finish isd
                 left join bas_product bp on isd.product_id = bp.product_id
-                where bp.product_name like concat('%',#{materialDesc},'%')
+                where isd.product_name like concat('%',#{materialDesc},'%')
                 )
             </if>
             <if test="lotNo !=null and lotNo!=''">
diff --git a/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml b/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
index 2172c17..345e5e6 100644
--- a/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/in/InStockinMapper.xml
@@ -84,7 +84,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and is2.stockin_id in (
                 select distinct stockin_id from in_stockin_detail isd
                 left join bas_product bp on isd.product_id = bp.product_id
-                where bp.product_name like concat('%',#{materialDesc},'%')
+                where isd.product_name like concat('%',#{materialDesc},'%')
                 )
             </if>
             <if test="lotNo !=null and lotNo!=''">
@@ -111,6 +111,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where is2.stockin_guid = #{stockinGuid}
     </select>
 
+    <select id="selectInStockinByStockinId" parameterType="String" resultMap="InStockinResult">
+        <include refid="selectInStockinVo"/>
+        where is2.stockin_id = #{stockinId}
+    </select>
+
     <insert id="insertInStockin" parameterType="InStockin">
         insert into in_stockin
         <trim prefix="(" suffix=")" suffixOverrides=",">
diff --git a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
index 4e2fe7e..3604b76 100644
--- a/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/job/MydoJobMapper.xml
@@ -35,7 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="cargoSpaceName"    column="cargo_space_name"    />
         <result property="targetCargoSpaceName"    column="target_cargo_space_name"    />
         <result property="warehouseName"    column="warehouse_name"    />
-        <result property="departmentName"    column="dept_name"    />
+
     </resultMap>
 
     <sql id="selectMydoJobVo">
@@ -46,14 +46,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                mj.exit_id, mj.class_id, mj.warehouse_id, mj.fault_flag,
                bs.supplier_name as supplier_name, bc.customer_name as customer_name,
                bcs.cargo_space_name as cargo_space_name, bcst.cargo_space_name as target_cargo_space_name,
-               bw.warehouse_name as warehouse_name,sd.dept_name
+               bw.warehouse_name as warehouse_name
         from mydo_job mj
         left join bas_supplier bs on mj.supplier_id = bs.id
         left join bas_customer bc on mj.customer_id = bc.id
         left join bas_cargo_space bcs on mj.cargo_space_id = bcs.cargo_space_id
         left join bas_cargo_space bcst on mj.target_cargo_space_id = bcst.cargo_space_id
         left join bas_warehouse bw on mj.warehouse_id = bw.warehouse_id
-        left join sys_dept sd on mj.department_id = sd.dept_id
+
 
     </sql>
 
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
index 340b108..a817bac 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
@@ -33,18 +33,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="erpStockoutId"    column="erp_stockout_id"    />
         <result property="unit"    column="unit"    />
         <result property="spec"    column="spec"    />
-        <result property="supplierId"    column="supplier_id"    />
-        <result property="cargoNo"    column="cargo_no"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="printDate"    column="print_date"    />
-        <result property="voltage"    column="voltage"    />
-        <result property="power"    column="power"    />
-        <result property="phase"    column="phase"    />
-        <result property="netWeight"    column="net_weight"    />
-        <result property="grossWeight"    column="gross_weight"    />
-        <result property="distribution"    column="distribution"    />
-        <result property="model"    column="model"    />
-        <result property="orderId"    column="order_id"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
+        <result property="spare6"    column="spare6"    />
+        <result property="spare7"    column="spare7"    />
+        <result property="spare8"    column="spare8"    />
+        <result property="spare9"    column="spare9"    />
 
     </resultMap>
 
@@ -52,9 +49,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
                d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
                d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
-               d.erp_stockout_id, d.unit, d.spec,  d.supplier_id, d.cargo_no, d.create_time, d.print_date,
-               d.voltage, d.power, d.phase, d.net_weight, d.gross_weight, d.distribution, d.model, d.order_id,
-               d.product_name
+               d.erp_stockout_id, d.unit, d.spec,
+               d.product_name ,d.spare1, d.spare2, d.spare3, d.spare4,d.spare5, d.spare6,d.spare7,d.spare8,d.spare9
         from out_stockout_detail d
     </sql>
 
@@ -88,17 +84,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="unit != null  and unit != ''"> and d.unit like concat('%', #{unit}, '%')</if>
             <if test="spec != null  and spec != ''"> and d.spec like concat('%', #{spec}, '%')</if>
 
-            <if test="supplierId != null  and supplierId != ''"> and d.supplier_id like concat('%', #{supplierId}, '%')</if>
-            <if test="cargoNo != null  and cargoNo != ''"> and d.cargo_no = #{cargoNo}</if>
-            <if test="printDate != null  and printDate != ''"> and d.print_date = #{printDate}</if>
-            <if test="voltage != null  and voltage != ''"> and d.voltage = #{voltage}</if>
-            <if test="power != null  and power != ''"> and d.power = #{power}</if>
-            <if test="phase != null  and phase != ''"> and d.phase = #{phase}</if>
-            <if test="netWeight != null "> and d.net_weight = #{netWeight}</if>
-            <if test="grossWeight != null "> and d.gross_weight = #{grossWeight}</if>
-            <if test="distribution != null  and distribution != ''"> and d.distribution = #{distribution}</if>
-            <if test="model != null  and model != ''"> and d.model = #{model}</if>
-            <if test="orderId != null  and orderId != ''"> and d.order_id = #{orderId}</if>
+            <if test="spare1 != null and spare1 != ''"> and isd.spare1 = #{spare1}</if>
+            <if test="spare2 != null and spare2 != ''"> and isd.spare2 = #{spare2}</if>
+            <if test="spare3 != null and spare3 != ''"> and isd.spare3 = #{spare3}</if>
+            <if test="spare4 != null and spare4 != ''"> and isd.spare4 = #{spare4}</if>
+            <if test="spare5 != null and spare5 != ''"> and isd.spare5 = #{spare5}</if>
+            <if test="spare6 != null and spare6 != ''"> and isd.spare6 = #{spare6}</if>
+            <if test="spare7 != null and spare7 != ''"> and isd.spare7 = #{spare7}</if>
+            <if test="spare8 != null and spare8 != ''"> and isd.spare8 = #{spare8}</if>
+            <if test="spare9 != null and spare9 != ''"> and isd.spare9 = #{spare9}</if>
         </where>
     </select>
 
@@ -138,61 +132,56 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="erpStockoutId != null">erp_stockout_id,</if>
             <if test="unit != null">unit,</if>
             <if test="spec != null">spec,</if>
-            <if test="supplierId != null">supplier_id,</if>
-            <if test="cargoNo != null">cargo_no,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="printDate != null">print_date,</if>
-            <if test="voltage != null">voltage,</if>
-            <if test="power != null">power,</if>
-            <if test="phase != null">phase,</if>
-            <if test="netWeight != null">net_weight,</if>
-            <if test="grossWeight != null">gross_weight,</if>
-            <if test="distribution != null">distribution,</if>
-            <if test="model != null">model,</if>
-            <if test="orderId != null">order_id,</if>
-         </trim>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare5 != null">spare5,</if>
+            <if test="spare6 != null">spare6,</if>
+            <if test="spare7 != null">spare7,</if>
+            <if test="spare8 != null">spare8,</if>
+            <if test="spare9 != null">spare9,</if>
+
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="stockoutDetailId != null and stockoutDetailId != ''">#{stockoutDetailId},</if>
-            <if test="stockoutGuid != null">#{stockoutGuid},</if>
-            <if test="stockoutId != null">#{stockoutId},</if>
-            <if test="lotNo != null">#{lotNo},</if>
-            <if test="productGuid != null">#{productGuid},</if>
-            <if test="productId != null">#{productId},</if>
-            <if test="productName != null">#{productName},</if>
-            <if test="quantity != null">#{quantity},</if>
-            <if test="quantityX != null">#{quantityX},</if>
-            <if test="quantityJ != null">#{quantityJ},</if>
-            <if test="assignNum != null">#{assignNum},</if>
-            <if test="assignNumX != null">#{assignNumX},</if>
-            <if test="assignNumJ != null">#{assignNumJ},</if>
-            <if test="allotQuantity != null">#{allotQuantity},</if>
-            <if test="allotQuantityX != null">#{allotQuantityX},</if>
-            <if test="allotQuantityJ != null">#{allotQuantityJ},</if>
-            <if test="price != null">#{price},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="warehouseId != null">#{warehouseId},</if>
-            <if test="outId != null">#{outId},</if>
-            <if test="bukechaiQuantity != null">#{bukechaiQuantity},</if>
-            <if test="kechaiQuantity != null">#{kechaiQuantity},</if>
-            <if test="entryid != null">#{entryid},</if>
-            <if test="flatQuantity != null">#{flatQuantity},</if>
-            <if test="fid != null">#{fid},</if>
-            <if test="erpStockoutId != null">#{erpStockoutId},</if>
-            <if test="unit != null">#{unit},</if>
-            <if test="spec != null">#{spec},</if>
-            <if test="supplierId != null">#{supplierId},</if>
-            <if test="cargoNo != null">#{cargoNo},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="printDate != null">#{printDate},</if>
-            <if test="voltage != null">#{voltage},</if>
-            <if test="power != null">#{power},</if>
-            <if test="phase != null">#{phase},</if>
-            <if test="netWeight != null">#{netWeight},</if>
-            <if test="grossWeight != null">#{grossWeight},</if>
-            <if test="distribution != null">#{distribution},</if>
-            <if test="model != null">#{model},</if>
-            <if test="orderId != null">#{orderId},</if>
-         </trim>
+        <if test="stockoutDetailId != null and stockoutDetailId != ''">#{stockoutDetailId},</if>
+        <if test="stockoutGuid != null">#{stockoutGuid},</if>
+        <if test="stockoutId != null">#{stockoutId},</if>
+        <if test="lotNo != null">#{lotNo},</if>
+        <if test="productGuid != null">#{productGuid},</if>
+        <if test="productId != null">#{productId},</if>
+        <if test="productName != null">#{productName},</if>
+        <if test="quantity != null">#{quantity},</if>
+        <if test="quantityX != null">#{quantityX},</if>
+        <if test="quantityJ != null">#{quantityJ},</if>
+        <if test="assignNum != null">#{assignNum},</if>
+        <if test="assignNumX != null">#{assignNumX},</if>
+        <if test="assignNumJ != null">#{assignNumJ},</if>
+        <if test="allotQuantity != null">#{allotQuantity},</if>
+        <if test="allotQuantityX != null">#{allotQuantityX},</if>
+        <if test="allotQuantityJ != null">#{allotQuantityJ},</if>
+        <if test="price != null">#{price},</if>
+        <if test="remark != null">#{remark},</if>
+        <if test="warehouseId != null">#{warehouseId},</if>
+        <if test="outId != null">#{outId},</if>
+        <if test="bukechaiQuantity != null">#{bukechaiQuantity},</if>
+        <if test="kechaiQuantity != null">#{kechaiQuantity},</if>
+        <if test="entryid != null">#{entryid},</if>
+        <if test="flatQuantity != null">#{flatQuantity},</if>
+        <if test="fid != null">#{fid},</if>
+        <if test="erpStockoutId != null">#{erpStockoutId},</if>
+        <if test="unit != null">#{unit},</if>
+        <if test="spec != null">#{spec},</if>
+        <if test="spare1 != null">#{spare1},</if>
+        <if test="spare2 != null">#{spare2},</if>
+        <if test="spare3 != null">#{spare3},</if>
+        <if test="spare4 != null">#{spare4},</if>
+        <if test="spare5 != null">#{spare5},</if>
+        <if test="spare6 != null">#{spare6},</if>
+        <if test="spare7 != null">#{spare7},</if>
+        <if test="spare8 != null">#{spare8},</if>
+        <if test="spare9 != null">#{spare9},</if>
+</trim>
     </insert>
 
     <update id="updateOutStockoutDetail" parameterType="OutStockoutDetail">
@@ -224,18 +213,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
             <if test="unit != null">unit = #{unit},</if>
             <if test="spec != null">spec = #{spec},</if>
-            <if test="supplierId != null">supplier_id = #{supplierId},</if>
-            <if test="cargoNo != null">cargo_no = #{cargoNo},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="printDate != null">print_date = #{printDate},</if>
-            <if test="voltage != null">voltage = #{voltage},</if>
-            <if test="power != null">power = #{power},</if>
-            <if test="phase != null">phase = #{phase},</if>
-            <if test="netWeight != null">net_weight = #{netWeight},</if>
-            <if test="grossWeight != null">gross_weight = #{grossWeight},</if>
-            <if test="distribution != null">distribution = #{distribution},</if>
-            <if test="model != null">model = #{model},</if>
-            <if test="orderId != null">order_id = #{orderId},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
+            <if test="spare6 != null">spare6 = #{spare6},</if>
+            <if test="spare7 != null">spare7 = #{spare7},</if>
+            <if test="spare8 != null">spare8 = #{spare8},</if>
+            <if test="spare9 != null">spare9 = #{spare9},</if>
+
         </trim>
         where stockout_detail_id = #{stockoutDetailId}
     </update>
@@ -255,9 +242,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
                d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
                d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
-               d.erp_stockout_id, d.unit, d.spec,  d.supplier_id, d.cargo_no, d.create_time, d.print_date,
-               d.voltage, d.power, d.phase, d.net_weight, d.gross_weight, d.distribution, d.model, d.order_id,
-               p.product_name
+               d.erp_stockout_id, d.unit, d.spec,
+               p.product_name,d.spare1, d.spare2, d.spare3, d.spare4,d.spare5, d.spare6,d.spare7,d.spare8,d.spare9
                from out_stockout_detail d left join bas_product p on d.product_id = p.product_id
         where d.stockout_guid = #{stockoutGuid}
     </select>
diff --git a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
index 039f7ef..84ac0fb 100644
--- a/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
@@ -24,15 +24,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="finishDate"    column="finish_date"    />
         <result property="warehouseName"    column="warehouse_name"    />
         <result property="customerName"    column="customer_name"    />
+        <result property="spare1"    column="spare1"    />
+        <result property="spare2"    column="spare2"    />
+        <result property="spare3"    column="spare3"    />
+        <result property="spare4"    column="spare4"    />
+        <result property="spare5"    column="spare5"    />
     </resultMap>
 
     <sql id="selectOutStockoutVo">
-        select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, car_number, FID, erp_stockout_id,start_date,finish_date from out_stockout
+        select stockout_guid, stockout_id, out_type, create_date, department_no, customer_no, create_man_id, status, stockout_source, warehouse_id, class_now_id, exit_id, car_number, FID, erp_stockout_id,start_date,finish_date,spare1,spare2,spare3,spare4,spare5 from out_stockout
     </sql>
 
     <select id="selectOutStockoutList" parameterType="OutStockout" resultMap="OutStockoutResult">
         select distinct o.stockout_guid, o.stockout_id, o.out_type, o.create_date, o.department_no, o.customer_no, o.create_man_id, o.status, o.stockout_source,
-        o.warehouse_id, o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,bw.warehouse_name,bc.customer_name  from out_stockout o
+        o.warehouse_id, o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,bw.warehouse_name,bc.customer_name,o.spare1,o.spare2,o.spare3,o.spare4,o.spare5  from out_stockout o
         left join bas_warehouse bw on bw.warehouse_id = o.warehouse_id
          left join bas_customer bc on bc.customer_no = o.customer_no
         left join out_stockout_detail d on d.stockout_id = o.stockout_id
@@ -57,6 +62,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="productId != null  and productId != ''"> and d.product_id = #{productId}</if>
             <if test="productName != null  and productName != ''"> and d.product_name like concat('%', #{productName}, '%')</if>
             <if test="customerName != null  and customerName != ''"> and bc.customer_name like concat('%', #{customerName}, '%')</if>
+            <if test="spare1 != null  and spare1 != ''"> and is2.spare1 like concat('%', #{spare1},'%')</if>
+            <if test="spare2 != null  and spare2 != ''"> and is2.spare2 like concat('%', #{spare2},'%')</if>
+            <if test="spare4 != null  and spare4 != ''"> and is2.spare4 = #{spare4}</if>
+            <if test="spare3 != null  and spare3 != ''"> and is2.spare3 = #{spare3}</if>
+            <if test="spare5 != null  and spare5 != ''"> and is2.spare5 = #{spare5}</if>
+
         </where>
         order by o.create_date desc
     </select>
@@ -84,6 +95,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carNumber != null">car_number,</if>
             <if test="FID != null">FID,</if>
             <if test="erpStockoutId != null">erp_stockout_id,</if>
+            <if test="spare1 != null">spare1,</if>
+            <if test="spare2 != null">spare2,</if>
+            <if test="spare4 != null">spare4,</if>
+            <if test="spare3 != null">spare3,</if>
+            <if test="spare5 != null">spare5,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stockoutGuid != null and stockoutGuid != ''">#{stockoutGuid},</if>
@@ -101,6 +117,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="carNumber != null">#{carNumber},</if>
             <if test="FID != null">#{FID},</if>
             <if test="erpStockoutId != null">#{erpStockoutId},</if>
+            <if test="spare1 != null">#{spare1},</if>
+            <if test="spare2 != null">#{spare2},</if>
+            <if test="spare4 != null">#{spare4},</if>
+            <if test="spare3 != null">#{spare3},</if>
+            <if test="spare5 != null">#{spare5},</if>
          </trim>
     </insert>
 
@@ -123,6 +144,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="erpStockoutId != null">erp_stockout_id = #{erpStockoutId},</if>
             <if test="startDate != null">start_date = #{startDate},</if>
             <if test="finishDate != null">finish_date = #{finishDate},</if>
+            <if test="spare1 != null">spare1 = #{spare1},</if>
+            <if test="spare2 != null">spare2 = #{spare2},</if>
+            <if test="spare4 != null">spare4 = #{spare4},</if>
+            <if test="spare3 != null">spare3 = #{spare3},</if>
+            <if test="spare5 != null">spare5 = #{spare5},</if>
         </trim>
         where stockout_guid = #{stockoutGuid}
     </update>
@@ -188,6 +214,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                         o.erp_stockout_id,
                         o.start_date,
                         o.finish_date,
+                        o.spare1,
+                        o.spare2,
+                        o.spare4,
+                        o.spare3,
+                        o.spare5,
                         bw.warehouse_name,
                         bc.customer_name
         from out_stockout o
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index cbb7999..edd56ef 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -104,7 +104,7 @@ public class SecurityConfig
                     // 静态资源，可匿名访问
                     .requestMatchers(HttpMethod.GET, "/", "/*.html", "/**.html", "/**.css", "/**.js", "/profile/**").permitAll()
                     .requestMatchers("/swagger-ui.html", "/v3/api-docs/**", "/swagger-ui/**", "/druid/**").permitAll()
-                    .requestMatchers("/api/**","/api2wms/**").permitAll()
+                    .requestMatchers("/api/**","/api2wms/**","api2erp/**").permitAll()
                     // 除上面外的所有请求全部需要鉴权认证
                     .anyRequest().authenticated();
             })
diff --git a/ruoyi-ui/src/views/in/job/index.vue b/ruoyi-ui/src/views/in/job/index.vue
index 4d73988..dcc5c44 100644
--- a/ruoyi-ui/src/views/in/job/index.vue
+++ b/ruoyi-ui/src/views/in/job/index.vue
@@ -2,7 +2,7 @@
   <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="status">
+      <el-form-item label="作业状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable>
           <el-option
             v-for="dict in dict.type.mydo_job_status"
@@ -12,7 +12,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="任务类型" prop="inOrOut">
+      <el-form-item label="作业类型" prop="inOrOut">
         <el-select v-model="queryParams.inOrOut" placeholder="请选择任务类型" clearable>
           <el-option
             v-for="dict in dict.type.in_job_type"
@@ -30,34 +30,34 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="巷道" prop="roadwayId">
-        <el-input
-          v-model="queryParams.roadwayId"
-          placeholder="请输入巷道"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="序列号" prop="trayCode"> <!-- 托盘条码 -->
+<!--      <el-form-item label="巷道" prop="roadwayId">-->
+<!--        <el-input-->
+<!--          v-model="queryParams.roadwayId"-->
+<!--          placeholder="请输入巷道"-->
+<!--          clearable-->
+<!--          @keyup.enter.native="handleQuery"-->
+<!--        />-->
+<!--      </el-form-item>-->
+      <el-form-item label="托盘条码" prop="trayCode"> <!-- 托盘条码 -->
         <el-input
           v-model="queryParams.trayCode"
-          placeholder="请输入序列号"
+          placeholder="请输入托盘条码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="品号" prop="productId">
+      <el-form-item label="存货编码" prop="productId">
         <el-input
           v-model="queryParams.productId"
-          placeholder="请输入品号"
+          placeholder="请输入存货编码"
           clearable
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="订单号" prop="lineId">
+      <el-form-item label="项目号" prop="lineId">
         <el-input
           v-model="queryParams.lineId"
-          placeholder="请输入订单号"
+          placeholder="请输入项目号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -135,8 +135,8 @@
     <el-table v-loading="loading" :data="mydoJobList" @selection-change="handleSelectionChange" @row-click="handleRowClick" highlight-current-row :current-row="currentRow"
       max-height="400">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务ID" align="left" prop="jobId" fixed width="140" />
-      <el-table-column label="任务状态" align="left" prop="status">
+      <el-table-column label="作业编码" align="left" prop="jobId" fixed width="140" />
+      <el-table-column label="状态" align="left" prop="status">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.mydo_job_status" :value="scope.row.status"/>
         </template>
@@ -146,21 +146,22 @@
 <!--          <dict-tag :options="dict.type.on_line_type" :value="scope.row.onLineType"/>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column label="任务类型" align="left" prop="inOrOut">
+      <el-table-column label="作业类型" align="left" prop="inOrOut">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.in_job_type" :value="scope.row.inOrOut"/>
         </template>
       </el-table-column>
       <el-table-column label="任务号" align="left" prop="taskNo" />
-      <el-table-column label="巷道" align="left" prop="roadwayId" sortable/>
+<!--      <el-table-column label="巷道" align="left" prop="roadwayId" sortable/>-->
       <el-table-column label="货位" align="left" prop="cargoSpaceName" width="140" sortable/>
+      <el-table-column label="托盘条码" align="left" prop="trayCode" width="140" />
 <!--      <el-table-column label="优先级" align="left" prop="priority" />-->
 <!--      <el-table-column label="执行阶段" align="left" prop="executionPhase">-->
 <!--        <template slot-scope="scope">-->
 <!--          <dict-tag :options="dict.type.execution_phase_type" :value="scope.row.executionPhase"/>-->
 <!--        </template>-->
 <!--      </el-table-column>-->
-      <el-table-column label="订单号" align="left" prop="lineId" />
+      <el-table-column label="项目号" align="left" prop="lineId" />
       <el-table-column label="入口" align="left" prop="entranceId" sortable/>
 <!--      <el-table-column label="仓库" align="left" prop="warehouseName" />-->
       <el-table-column label="创建时间" align="left" prop="createTime" width="180" sortable/>
@@ -180,25 +181,22 @@
               max-height="300"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="子任务ID" align="left" prop="jobDetailId" width="150" />
-      <el-table-column label="任务ID" align="left" prop="jobId" width="140" />
-      <el-table-column label="单据ID" align="left" prop="inOrOutId" width="150" />
-      <el-table-column label="子单据ID" align="left" prop="inOrOutDId" width="160" />
-      <el-table-column label="品号" align="left" prop="productId" width="140" />
-      <el-table-column label="品名" align="left" prop="productName" />
+      <el-table-column label="子作业编码" align="left" prop="jobDetailId" width="150" />
+      <el-table-column label="作业编码" align="left" prop="jobId" width="140" />
+      <el-table-column label="单据编码" align="left" prop="inOrOutId" width="150" />
+      <el-table-column label="子单据编码" align="left" prop="inOrOutDId" width="160" />
+      <el-table-column label="存货编码" align="left" prop="productId" width="140" />
+      <el-table-column label="存货名称" align="left" prop="productName" />
       <el-table-column label="批号" align="left" prop="lotNo" />
       <el-table-column label="入库数量" align="right" prop="inQuantity" />
-      <el-table-column label="机型" align="left" prop="unit"/><!--机型-->
-      <el-table-column label="分销" align="left" prop="spare9"/><!--分销-->
-      <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="spare4" width="130"/><!--序列号-->
-      <el-table-column label="电压" align="left" prop="spare5"/><!--电压-->
-      <el-table-column label="功率" align="left" prop="spare6"/><!--功率-->
-      <el-table-column label="相位" align="left" prop="spare7"/><!--相位-->
-      <el-table-column label="毛重" align="left" prop="spare8"/><!--毛重-->
+      <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="spare5"/><!--电压-->
+      <el-table-column label="销售订单号" align="left" prop="spare6"/><!--功率-->
+
     </el-table>
 
     <pagination