1.入库码盘，物料不存在提醒

2.erp出库单存入类型修改

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/IWmsDocAsnHeaderService.java

@@ -205,7 +205,7 @@ public interface IWmsDocAsnHeaderService {
      *
      * @param erpOrderList
      */
-    void addOrUpdateErp(List<ErpOrderList> erpOrderList);
+    AjaxResult addOrUpdateErp(List<ErpOrderList> erpOrderList);
 
     /**
      * 在erp_barcodes中插入入库单扫描记录，其实是关联批次插入数据

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/impl/WmsDocAsnHeaderServiceImpl.java

@@ -49,6 +49,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.ruoyi.common.utils.StringUtils;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.ams.asn.domain.WmsDocAsnDetails;
 import com.ruoyi.ams.asn.mapper.WmsDocAsnHeaderMapper;
@@ -683,7 +684,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
 
     @Transactional
     @Override
-    public void addOrUpdateErp(List<ErpOrderList> erpOrderList) {
+    public AjaxResult addOrUpdateErp(List<ErpOrderList> erpOrderList) {
         String asnNo = "";
 //        String erpName = erpOrderList.get(0).getOrderName();
 //        WmsDocAsnHeader asnHeader = this.selectWmsDocAsnHeaderByErpNo(erpName);
@@ -729,6 +730,7 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
         wmsDocAsnHeader.setExpectedArriveTime(new Date());
         wmsDocAsnHeader.setEdiSendFlag("N");
         wmsDocAsnHeaderMapper.insertWmsDocAsnHeader(wmsDocAsnHeader);
+        return AjaxResult.success();
     }
 
     /**

warewms-ams/src/main/java/com/ruoyi/ams/erp/service/impl/SyncServiceImpl.java

@@ -20,6 +20,7 @@ import com.ruoyi.base.domain.CodeSkuRelationship;
 import com.ruoyi.base.service.IBaseSkuService;
 import com.ruoyi.base.service.IBaseSkuTypeService;
 import com.ruoyi.base.service.ICodeSkuRelationshipService;
+import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.http.HttpRequest;
 import com.ruoyi.common.utils.http.HttpUtils;
@@ -75,7 +76,6 @@ public class SyncServiceImpl implements ISyncService {
         }
     }
 
-    @Transactional
     @Override
     public void syncSku()  {
         // 品号基础表
@@ -118,6 +118,7 @@ public class SyncServiceImpl implements ISyncService {
         }
     }
 
+    @Transactional
     @Override
     public void syncOrderList() {
         // ERP需求单
@@ -148,10 +149,10 @@ public class SyncServiceImpl implements ISyncService {
                 }
             }
             for (Map.Entry<String, List<ErpOrderList>> entry : inmap.entrySet()) {
-                wmsDocAsnHeaderService.addOrUpdateErp(entry.getValue());
+                AjaxResult ajaxResult = wmsDocAsnHeaderService.addOrUpdateErp(entry.getValue());
             }
             for (Map.Entry<String, List<ErpOrderList>> entry : outmap.entrySet()) {
-                wmsDocOrderHeaderService.addOrUpdateErp(entry.getValue());
+                AjaxResult ajaxResult = wmsDocOrderHeaderService.addOrUpdateErp(entry.getValue());
             }
             redisTemplate.delete("erpOrderList");
         }

warewms-ams/src/main/java/com/ruoyi/ams/order/service/IWmsDocOrderHeaderService.java

@@ -284,7 +284,7 @@ public interface IWmsDocOrderHeaderService {
      *
      * @param erpOrderLists
      */
-    void addOrUpdateErp(List<ErpOrderList> erpOrderLists);
+    AjaxResult addOrUpdateErp(List<ErpOrderList> erpOrderLists);
 
     /**
      * 在erp_barcodes中插入出库单扫描记录，其实是关联批次插入数据

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -36,10 +36,12 @@ import com.ruoyi.ams.order.vo.PickingListVO;
 import com.ruoyi.ams.order.vo.StockOrderVO;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.base.domain.BaseLocationInfo;
+import com.ruoyi.base.domain.BaseSku;
 import com.ruoyi.base.domain.vo.CodeSkuRelationshipSoVO;
 import com.ruoyi.base.domain.vo.CodeSkuRelationshipVO;
 import com.ruoyi.base.form.SnCheckSoForm;
 import com.ruoyi.base.service.IBaseLocationInfoService;
+import com.ruoyi.base.service.IBaseSkuService;
 import com.ruoyi.base.service.ICodeSkuRelationshipService;
 import com.ruoyi.base.utils.IdSequenceUtils;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -102,6 +104,8 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
     private IInvLotAttService invLotAttService;
     @Autowired
     private IWmsDocAsnHeaderService iWmsDocAsnHeaderService;
+    @Autowired
+    private IBaseSkuService baseSkuService;
 
     /**
      * 查询出库单头
@@ -1569,8 +1573,9 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         return codeSkuRelationshipSoVO;
     }
 
+    @Transactional
     @Override
-    public void addOrUpdateErp(List<ErpOrderList> erpOrderList) {
+    public AjaxResult addOrUpdateErp(List<ErpOrderList> erpOrderList) {
         String orderNo = "";
 //        String erpName = erpOrderList.get(0).getOrderName();
 //        WmsDocOrderHeader header = this.selectWmsDocOrderHeaderByErpNo(erpName);
@@ -1617,10 +1622,10 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         }
         WmsDocOrderHeader orderHeader = new WmsDocOrderHeader();
         orderHeader.setOrderNo(orderNo);            //erp单号
-        if (erpOrderList.get(0).getOrderType() == "axmt620") {
-            orderHeader.setOrderType("BH");
+        if (erpOrderList.get(0).getOrderType().equals("axmt620")) {
+            orderHeader.setOrderType(Constant.ORDER_TYP.BH.getValue());
         } else {
-            orderHeader.setOrderType("ZC");
+            orderHeader.setOrderType(Constant.ORDER_TYP.ZC.getValue());
         }
         orderHeader.setOrderStatus("00");
         orderHeader.setCustomerId(Constant.CUSTOMER_ID);
@@ -1629,6 +1634,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
         orderHeader.setCreateTime(new Date());
         orderHeader.setCreateBy("ERP");
         wmsDocOrderHeaderMapper.insertWmsDocOrderHeader(orderHeader);
+        return AjaxResult.success("");
     }
 
     @Override

warewms-base/src/main/java/com/ruoyi/base/service/impl/CodeSkuRelationshipServiceImpl.java

@@ -142,6 +142,11 @@ public class CodeSkuRelationshipServiceImpl implements ICodeSkuRelationshipServi
             //成品条码
             CodeSkuRelationshipVO tmp = codeSkuRelationshipVO.get(0);
             tmp.setProduct(true);
+            //物料条码
+            BaseSku baseSku = baseSkuService.selectBaseSkuByCustomerId(Constant.CUSTOMER_ID, tmp.getSku());
+            if (baseSku == null) {
+                throw new ServiceException("物料不存在");
+            }
             return tmp;
         } else if (codeSkuRelationshipVO == null || codeSkuRelationshipVO.size() == 0) {
             CodeSkuRelationshipVO tmp = new CodeSkuRelationshipVO();