From 9a54bbc61b202fc851b3e56fb89dfa86099781eb Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 3 May 2024 08:37:09 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/web/emis/EmisTransProductController.java    | 1 +
 .../erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java    | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransProductController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransProductController.java
index 7889cf93a..ba9a699da 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransProductController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTransProductController.java
@@ -69,6 +69,7 @@ public class EmisTransProductController extends BaseController
     public TableDataInfo listSimple(EmisTransProduct emisTransProduct)
     {
         startPage();
+        emisTransProduct.setStatus(1);
         List<EmisTransProduct> list = emisTransProductService.selectEmisTransProductList(emisTransProduct);
         return getDataTable(list);
     }
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
index 7a5845708..b7d0de282 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
@@ -221,7 +221,6 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
                 emisTmsScanRecord.setScanSitePhone(scanSite.getPhone());
             }
 
-            ScanType opCodeType = ScanType.valueOf(scanType);
             if(ScanType.GOT.opCode.equals(scanType)){
                 setScanGot(emisTmsScanRecord,scanDataItem);
             }
@@ -253,9 +252,9 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
         double scanWeight = 0.0D;
         if(!StringUtils.isEmpty(scanWeightStr)){
             scanWeight= Double.valueOf(scanWeightStr);
+            emisTmsScanRecord.setWeight(BigDecimal.valueOf(scanWeight));
         }
 
-        emisTmsScanRecord.setWeight(BigDecimal.valueOf(scanWeight));
         emisTmsScanRecord.setDispatchOrSendManCode(dispatchOrSendManCode);
         SysUser emUser=getEmisStaffByCode(dispatchOrSendManCode);
         if(emUser!=null){