tijiao

src/main/java/com/steerinfo/dil/service/impl/RmsMaterialSteelServiceImpl.java

@@ -6,6 +6,7 @@ import com.steerinfo.dil.mapper.RmsMaterialMapper;
 import com.steerinfo.dil.mapper.RmsMaterialSteelMapper;
 import com.steerinfo.dil.model.RmsMaterialSteel;
 import com.steerinfo.dil.service.IRmsMaterialSteelService;
+import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.DecompileUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -92,14 +93,15 @@ public class RmsMaterialSteelServiceImpl implements IRmsMaterialSteelService {
         //设置物资理重
         //如果物资支数为空，就设置物资磅重
         if (materialCount.length()==0) {
-            rmsMaterialSteel.setMaterialSingleBundleWeight(new BigDecimal(TheoreticalWeight));
+            rmsMaterialSteel.setMaterialSingleBundleWeight(DataChange.dataToBigDecimal(TheoreticalWeight));
             //反编译物资理重
-           DecompileUtil decompileUtil=new DecompileUtil();
-            int weight = decompileUtil.DecompileUtiltest(TheoreticalWeight);
-            rmsMaterialSteel.setMaterialTheoreticalWeight(new BigDecimal(weight));
-
+            if(TheoreticalWeight != null && !"".equals(TheoreticalWeight) ){
+                DecompileUtil decompileUtil=new DecompileUtil();
+                int weight = decompileUtil.DecompileUtiltest(TheoreticalWeight);
+                rmsMaterialSteel.setMaterialTheoreticalWeight(new BigDecimal(weight));
+            }
         }else {
-            rmsMaterialSteel.setMaterialTheoreticalWeight(new BigDecimal(TheoreticalWeight));
+            rmsMaterialSteel.setMaterialTheoreticalWeight(DataChange.dataToBigDecimal(TheoreticalWeight));
         }
         //设置物资支数
         //判断支数不为空
@@ -174,16 +176,17 @@ public class RmsMaterialSteelServiceImpl implements IRmsMaterialSteelService {
         //设置炉号
         rmsMaterialSteel.setMaterialFurnaceNumber(FurnaceNumber);
         //设置物资理重
-        //如果物资支数为空，就设置物资磅重
+        //如果物资支数为空，就设置物资榜重
         if (materialCount.length()==0) {
-            rmsMaterialSteel.setMaterialSingleBundleWeight(new BigDecimal(TheoreticalWeight));
+            rmsMaterialSteel.setMaterialSingleBundleWeight(DataChange.dataToBigDecimal(TheoreticalWeight));
             //反编译物资理重
-            DecompileUtil decompileUtil=new DecompileUtil();
-            int weight = decompileUtil.DecompileUtiltest(TheoreticalWeight);
-            rmsMaterialSteel.setMaterialTheoreticalWeight(new BigDecimal(weight));
-
+            if(TheoreticalWeight != null && !"".equals(TheoreticalWeight) ){
+                DecompileUtil decompileUtil=new DecompileUtil();
+                int weight = decompileUtil.DecompileUtiltest(TheoreticalWeight);
+                rmsMaterialSteel.setMaterialTheoreticalWeight(new BigDecimal(weight));
+            }
         }else {
-            rmsMaterialSteel.setMaterialTheoreticalWeight(new BigDecimal(TheoreticalWeight));
+            rmsMaterialSteel.setMaterialTheoreticalWeight(DataChange.dataToBigDecimal(TheoreticalWeight));
         }
         //设置物资支数
         //判断支数不为空

src/main/java/com/steerinfo/dil/service/impl/WmsInboundScanResultServiceImpl.java

@@ -275,14 +275,11 @@ public class WmsInboundScanResultServiceImpl implements IWmsInboundScanResultSer
         //设置主键自增，这里需要修改
         wmspInboundScanResult.setId(count());
         //获取班次次序的吊牌信息
-
         String[] result = resultMaterial.split("-");
         if(result.length == 10){
             String shiftOrder = result[9];
             wmspInboundScanResult.setShiftOrder(shiftOrder);
         }
-
-
         //分组
         //根据用户名和分组状态查询到分组信息
         BigDecimal groupId= wmspInboundGroupService.getGroupIdByUserName(userName);