修改

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

@@ -411,18 +411,30 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
     @Transactional
     public  synchronized RESTfulResult recordScanResult(@RequestBody(required = false)Map<String,Object> map) throws Exception {
         if(map.get("number")==null){
-            return failed("请输入数量");
-        }else if(map.get("materialCode")==null){
+            //return failed("请输入数量");
+            map.put("number",1);
+        }
+        if(map.get("materialCode")==null){
             return failed("请输入物资编码");
-        }else if(map.get("furnaceNumber")==null){
+        }
+        if(map.get("furnaceNumber")==null){
             return failed("请输入炉号");
-        }else if(map.get("userName")==null){
-            return failed("请输入用户名");
-        }else if(map.get("theoreticalWeight")==null){
+        }
+        if(map.get("userName")==null){
+            map.put("userName","L1267");
+            //return failed("请输入用户名");
+        }
+        if(map.get("theoreticalWeight")==null){
             return failed("请输入理重");
-        }else if(map.get("warehouseId")==null){
+        }
+        if(map.get("warehouseId")==null && map.get("warehouseName") == null){
             return failed("请输入仓库id");
         }
+        //根据仓库名称寻找仓库id
+        BigDecimal warehouseId = wmspInboundResultMapper.selectWarehouseIdByName(map.get("warehouseName").toString());
+        if(warehouseId != null) {
+            map.put("warehouseId",warehouseId);
+        }
         Integer number=Integer.parseInt(map.get("number").toString());
         String userName=map.get("userName").toString();
         if(number<=0){

src/main/java/com/steerinfo/dil/mapper/WmspInboundResultMapper.java

@@ -82,4 +82,6 @@ public interface WmspInboundResultMapper extends IBaseMapper<WmspInboundResult,
 
     List<Map<String, Object>> getFurnaceNoAmount(String startDate, String endDate);
 
+    BigDecimal selectWarehouseIdByName(String warehouseName);
+
 }

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

@@ -181,8 +181,14 @@ public class RmsMaterialSteelServiceImpl implements IRmsMaterialSteelService {
             //反编译物资理重
             if(TheoreticalWeight != null && !"".equals(TheoreticalWeight) ){
                 DecompileUtil decompileUtil=new DecompileUtil();
-                int weight = decompileUtil.DecompileUtiltest(TheoreticalWeight);
-                rmsMaterialSteel.setMaterialTheoreticalWeight(new BigDecimal(weight));
+                int weight = 0;
+                try {
+                    weight = decompileUtil.DecompileUtiltest(TheoreticalWeight);
+                    rmsMaterialSteel.setMaterialTheoreticalWeight(new BigDecimal(weight));
+                } catch (Exception e) {
+                    rmsMaterialSteel.setMaterialTheoreticalWeight(DataChange.dataToBigDecimal(TheoreticalWeight));
+                }
+
             }
         }else {
             rmsMaterialSteel.setMaterialTheoreticalWeight(DataChange.dataToBigDecimal(TheoreticalWeight));

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

@@ -475,11 +475,26 @@ public class WmsInboundScanResultServiceImpl implements IWmsInboundScanResultSer
     @Override
     public List<Map<String,Object>> createResultMaterials(Map<String,Object> map){
         List<Map<String,Object>> resultMaterials=new ArrayList<>();
-        SimpleDateFormat format=new SimpleDateFormat("yyyyMMdd");
-        //把今天作为生产日期
-        String today=format.format(new Date());
+        String today = null;
+        if(map.get("productDate") != null) {
+            today = (String) map.get("productDate");
+        }else{
+            SimpleDateFormat format=new SimpleDateFormat("yyyyMMdd");
+            //把今天作为生产日期
+            today=format.format(new Date());
+        }
+        String materialOnlyCode = null;
+        if(map.get("materialOnlyCode") != null) {
+            materialOnlyCode = map.get("materialOnlyCode").toString();
+        }else{
+            materialOnlyCode = "wuliuxitongbulu"+System.currentTimeMillis();
+        }
         //总数量
         Integer number=Integer.parseInt(map.get("number").toString());
+        String materialCount = "";
+        if(map.get("materialCount") != null) {
+            materialCount = map.get("materialCount").toString();
+        }
         //物资编码
         String materialCode=map.get("materialCode").toString();
         //炉号
@@ -505,9 +520,9 @@ public class WmsInboundScanResultServiceImpl implements IWmsInboundScanResultSer
                     +furnaceNumber+"-"
                     +"-"
                     +theoreticalWeight+"-"
-                    +"-"
+                    +materialCount + "-"
                     +today+"-"
-                    +i+"wuliuxitongbulu"+System.currentTimeMillis()+"-"//唯一编码
+                    +i+materialOnlyCode+"-"//唯一编码
                     +materialCode+"-"
                     +"1";
             temp.put("resultMaterial",resultMaterial);

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

@@ -1729,4 +1729,8 @@
                on rms.MATERIAL_STEEL_ID = wir.MATERIAL_ID
                where wir.INBOUND_ID= #{inboundId})
     </delete>
+    <select id="selectWarehouseIdByName" resultType="java.math.BigDecimal" parameterType="string">
+    SELECT * FROM RMS_WAREHOUSE RW
+    WHERE RW.WAREHOUSE_NAME = #{warehouseName}
+    </select>
 </mapper>

src/main/resources/log4j.properties

@@ -1,5 +1,5 @@
 ## LOG4J配置
-log4j.rootCategory=INFO, stdout,file, RUNNING,errorfile
+log4j.rootCategory=INFO,file, RUNNING,errorfile
 ## 控制台输出
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout