sd

src/main/java/com/steerinfo/dil/controller/WmspOutboundResultController.java

@@ -194,7 +194,6 @@ public class WmspOutboundResultController extends BaseRESTfulController {
 
         //判断物质是否已经被扫描
         int isScan = wmspOutboundResultService.ExistScanResult(subResultMaterial);
-
         //根据物资id查询相对应的入库实绩ID，并将其赋值给相对应的入库扫描实绩表,判断是否入库
         List<Map<String, Object>> list = wmspInboundScanResultMapper.getInboundResultIdByMaterial(subResultMaterial);
         if (list==null||list.size()==0){
@@ -206,6 +205,7 @@ public class WmspOutboundResultController extends BaseRESTfulController {
 
         }
         //判断物资是否是需要出库的物资类型,需要出库物资数量不等于0,通过物资唯一编码和出库实绩
+        //判断物资是否是需要出库的物资,需要出库物资数量不等于0,通过物资唯一编码和出库实绩
         Map<String,Object> materialMap = wmspOutboundResultMaterialService.isOutboundResultMaterial(MaterialOnlyCode,resultId);
         if (materialMap==null){
             //物质类型错误
@@ -268,7 +268,6 @@ public class WmspOutboundResultController extends BaseRESTfulController {
         int scanCount = wmspOutboundResultService.ExistScanResult(subResultMaterial);
         ///如果没有被扫描
         if(scanCount==0){
-
             //wmspOutboundResultService.getOutBoundId(resultNumber);
             //获取装卸工工号
             String personnelJobNumber = (String) map.get("personnelJobNumber");
@@ -474,6 +473,7 @@ public class WmspOutboundResultController extends BaseRESTfulController {
         }
         return failed(result);
     }
+
     @ApiOperation(value = "出库(非0:成功,0:失败)")
     @PostMapping("/outbountResultToSuccess2")
     public RESTfulResult outbountResultToSuccess(@RequestParam Integer resultId) {

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/WmsInboundResultServiceImpl.java

@@ -270,7 +270,6 @@ public class WmsInboundResultServiceImpl implements IWmsInboundResultService {
     }
 
     @Override
-
     public int undoInbound(BigDecimal inboundId) {
         //根据前端传过来的inboundId
         //对实时库存表进行删除

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);

src/main/resources/com/steerinfo/dil/mapper/WmspInboundResultMapper.xml

@@ -772,6 +772,7 @@
         select * from(
         SELECT
         wir.INBOUND_ID "inboundId",
+        wisr.MATERIAL_ID "materialId",
         RM.MATERIAL_NAME || RM.MATERIAL_SPECIFICATION || '(' ||
         RM.MATERIAL_MODEL || ')' "materialName",
         wisr.SHIFT_ORDER "shiftOrder",
@@ -1677,15 +1678,17 @@
 
     <delete id="deleteGridMaterialByInboudId" parameterType="java.math.BigDecimal">
          delete from WMSP_GRID_MATERIAL wgm
-         where (select wir.INBOUND_ID from WMSP_INBOUND_RESULT wir
+         where wgm.MATERIAL_ID = (select wgm.MATERIAL_ID from WMSP_INBOUND_RESULT wir
                left join WMSP_GRID_MATERIAL wgm
-               on wgm.MATERIAL_ID = wir.MATERIAL_ID) = #{inboundId}
+               on wgm.MATERIAL_ID = wir.MATERIAL_ID
+			   where wir.INBOUND_ID=#{inboundId})
     </delete>
 
     <delete id="deleteMaterialSteelByInboundId" parameterType="java.math.BigDecimal">
         delete from RMS_MATERIAL_STEEL rms
-         where (select wir.INBOUND_ID from WMSP_INBOUND_RESULT wir
+         where rms.MATERIAL_STEEL_ID = (select rms.MATERIAL_STEEL_ID from WMSP_INBOUND_RESULT wir
                left join RMS_MATERIAL_STEEL rms
-               on rms.MATERIAL_STEEL_ID = wir.MATERIAL_ID) = #{inboundId}
+               on rms.MATERIAL_STEEL_ID = wir.MATERIAL_ID
+               where wir.INBOUND_ID= #{inboundId})
     </delete>
 </mapper>