Tiroble 3 роки тому
батько
коміт
40fb727f68

+ 4 - 3
src/main/java/com/steerinfo/dil/controller/WmsInboundScanResultController.java

@@ -84,9 +84,10 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
             //创建一个扫码实绩
             Map<String, Object>  wmspInboundScanResult =wmsInboundScanResultService.createInboundScanResultByResultMaterial(mapList.size(),map.get("userName").toString(),map.get("resultMaterial").toString());
             //判断是否创建成功、成功在添加
-            if (wmspInboundScanResult!=null){
-                mapList.add(wmspInboundScanResult);
-            }
+//            if (wmspInboundScanResult!=null){
+//                mapList.add(wmspInboundScanResult);
+//            }
+            mapList= wmsInboundScanResultService.noIssueScanResultList(map.get("userName").toString());
         }
 
         return success(mapList);

+ 1 - 1
src/main/java/com/steerinfo/dil/service/impl/RmsMaterialSteelServiceImpl.java

@@ -168,7 +168,7 @@ public class RmsMaterialSteelServiceImpl implements IRmsMaterialSteelService {
         //设置物资主键ID
         rmsMaterialSteel.setMaterialSteelId(rmsMaterialSteelMapper.getCount());
         //设置物资id
-        rmsMaterialSteel.setMaterialId(new BigDecimal(mi.get("materialTypeId").toString()));
+        rmsMaterialSteel.setMaterialId(new BigDecimal(mi.get("materialId").toString()));
         //设置物资唯一编码
         rmsMaterialSteel.setMaterialOnlyCode(MaterialOnlyCode);
         //设置炉号

+ 1 - 0
src/main/resources/com/steerinfo/dil/mapper/RmsMaterialMapper.xml

@@ -436,6 +436,7 @@ select rm.material_id "id",
 
   <select id="getMaterialId2" resultType="java.util.Map">
      select
+     rm.material_id "materialId",
      rm.MATERIAL_TYPE_ID "materialTypeId",
      rm.UNIT_OF_MEASURE_ID "unitOfMeasureId",
      rm.MATERIAL_CODE "materialCode",