md

emis-biz/src/main/java/com/xdadan/erp/emis/domain/enumtype/WaybillAttachType.java

@@ -2,10 +2,10 @@ package com.xdadan.erp.emis.domain.enumtype;
 
 public enum WaybillAttachType {
 
-    GOT_PIC("1","揽收底单"),
+    GOT_PIC("1","寄件底单"),
     SIGNED_PIC("2","签收底单"),
     DECLEAR_PIC("3","报关文件"),
-    CLEAR_PIC("4","清关文件")
+    CLEAR_PIC("4","清关文件"),
     ;
 
     public String typeCode;

emis-biz/src/main/java/com/xdadan/erp/emis/domain/vo/WaybillOrder.java

@@ -594,6 +594,7 @@ public class WaybillOrder  implements Serializable {
         voItem.setSignDate(dbWaybill.getSignDate());
         voItem.setBillPicSendRmk(dbWaybill.getBillPicSendRmk());
         voItem.setBillPicDispatchRmk(dbWaybill.getBillPicDispatchRmk());
+        voItem.setBillPicGoodsRmk(dbWaybill.getBillPicGoodsRmk());
 //        voItem.setTimezoneOffset(dbWaybill.getTimezoneOffset());
 //        voItem.setDelFlag(dbWaybill.getDelFlag());
 //        voItem.setCreateBy(dbWaybill.getCreateBy());

emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java

@@ -503,7 +503,6 @@ public class EmisBaseService {
       * @param waybillProblemInfo
       */
      public void registerWaybillProblemInfo(EmisWaybillProblemInfo waybillProblemInfo){
-         waybillProblemInfo.preInsert();
          emisWaybillProblemInfoMapper.insertEmisWaybillProblemInfo(waybillProblemInfo);
      }
 

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java

@@ -15,6 +15,7 @@ import java.util.*;
 
 import com.xdadan.erp.common.core.domain.entity.SysUser;
 import com.xdadan.erp.common.utils.DateUtils;
+import com.xdadan.erp.common.utils.DictUtils;
 import com.xdadan.erp.emis.domain.*;
 import com.xdadan.erp.emis.domain.enumtype.ScanType;
 import com.xdadan.erp.emis.domain.enumtype.WaybillAttachType;
@@ -465,13 +466,22 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
         else if(ScanType.HOLD.opCode.equals(scanType)){
 //            "billCode": "T001,T002,T002",
 //                    "picUrl": "留仓图片,逗号隔开",
+//            "keepType": "留仓备注",
 //                    "remark": "留仓备注",
 //                    "scanDate": "2024-05-02 12:03:05",
 //                    "scanWeight": "0.2"
 
             String picUrl = (String)scanDataItem.get("picUrl");
+            String keepType = (String)scanDataItem.get("keepType");
             String remark = (String)scanDataItem.get("remark");
 
+
+
+            if(!StringUtils.isEmpty(keepType)){
+                String keepTypeDesc = DictUtils.getDictLabel("emis_keep_warehouse",keepType);
+                remark = keepTypeDesc + " " + remark;
+            }
+
             emisTmsScanRecord.setRemark(remark);
 
             EmisTmsScanPicInfo emisTmsScanPicInfo = new EmisTmsScanPicInfo();
@@ -535,6 +545,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
             waybillProblemInfo.setRegisterDate(emisTmsScanRecord.getScanDate());
             waybillProblemInfo.setRegisterManCode(emisTmsScanRecord.getScanManCode());
             waybillProblemInfo.setRegisterSiteCode(emisTmsScanRecord.getScanSiteCode());
+            waybillProblemInfo.setRegisterSaveDate(new Date());
             waybillProblemInfo.setProblemTitle(remark);
             waybillProblemInfo.setFilePath(picUrl);
 
@@ -569,6 +580,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
             emisTmsPackDtlMapper.updateScanStatus(emisTmsPackDtl);
 
         }
+        // 拆包
         else if(ScanType.UN_PACKING.opCode.equals(scanType)){
 //            "billCode": "T001,T002,T002",
 //                    "scanDate": "2024-05-02 12:03:05",
@@ -593,10 +605,13 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
 //                    "carNo": "粤Z01023",
 //                    "preOrNextStationCode": "25001108",
 //                    "scanDate": "2024-05-02 12:03:05",
+//                    "remark": "",
 //                    "scanWeight": "0.2"
             String carNo = (String)scanDataItem.get("carNo");
+            String remark = (String)scanDataItem.get("remark");
             String preOrNextStationCode = (String)scanDataItem.get("preOrNextStationCode");
             emisTmsScanRecord.setCarNo(carNo);
+            emisTmsScanRecord.setRemark(remark);
             emisTmsScanRecord.setPreOrNextStationCode(preOrNextStationCode);
 
             if(!StringUtils.isEmpty(preOrNextStationCode)) {
@@ -613,8 +628,13 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
 //                    "carNo": "粤Z01023",
 //                    "scanDate": "2024-05-02 12:03:05",
 //                    "scanWeight": "0.2"
+
             String carNo = (String)scanDataItem.get("carNo");
+            String remark = (String)scanDataItem.get("remark");
+
             emisTmsScanRecord.setCarNo(carNo);
+            emisTmsScanRecord.setRemark(remark);
+
         }
         // 报关扫描
         else if(ScanType.DECLEARE.opCode.equals(scanType)){

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java

@@ -25,6 +25,7 @@ import com.xdadan.erp.common.utils.DictUtils;
 import com.xdadan.erp.emis.domain.*;
 import com.xdadan.erp.emis.domain.enumtype.ScanType;
 import com.xdadan.erp.emis.domain.enumtype.TransType;
+import com.xdadan.erp.emis.domain.enumtype.WaybillAttachType;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType;
 import com.xdadan.erp.emis.domain.vo.*;