Merge branch 'master' of https://git.steerinfo.com/luobang/DIL-DAZHOU-WMS2

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

@@ -126,7 +126,7 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
         }else {
             //如果没有被扫
             //创建一个扫码实绩
-            Map<String, Object>  wmspInboundScanResult =wmsInboundScanResultService.createInboundScanResultByResultMaterial(mapList.size(),map.get("userName").toString(),map.get("resultMaterial").toString());
+            Map<String, Object>  wmspInboundScanResult =wmsInboundScanResultService.createInboundScanResultByResultMaterial(mapList.size(),map.get("userName").toString(),map.get("resultMaterial").toString(),""+map.get("hookNo"));
             //判断是否创建成功、成功在添加
 //            if (wmspInboundScanResult!=null){
 //                mapList.add(wmspInboundScanResult);
@@ -158,7 +158,7 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
         }else {
             //如果没有被扫
             //创建一个扫码实绩
-            Map<String, Object>  wmspInboundScanResult =wmsInboundScanResultService.createInboundScanResultByResultMaterial(mapList.size(),map.get("userName").toString(),map.get("resultMaterial").toString());
+            Map<String, Object>  wmspInboundScanResult =wmsInboundScanResultService.createInboundScanResultByResultMaterial(mapList.size(),map.get("userName").toString(),map.get("resultMaterial").toString(),""+map.get("hookNo"));
             //判断是否创建成功、成功在添加
 //            if (wmspInboundScanResult!=null){
 //                mapList.add(wmspInboundScanResult);
@@ -221,7 +221,7 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
         //设置逻辑删除字段
         wmspInboundScanResult.setResultDeleted(new BigDecimal(1));
         //新增钢材物资ID
-        Integer k = rmsMaterialSteelService.insertRmsMaterialSteel(str);
+        Integer k = rmsMaterialSteelService.insertRmsMaterialSteel(str,""+map.get("hookNo"));
         wmspInboundScanResult.setMaterialId(new BigDecimal(k));
         //根据班次班组查找同一车间的另一位小伙伴
         //判断物资是否为线材
@@ -396,7 +396,7 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
         }else {
             //如果没有被扫
             //创建一个扫码实绩
-            Map<String, Object>  wmspInboundScanResult =wmsInboundScanResultService.createInboundScanResultByResultMaterial2(mapList.size(),map.get("userName").toString(),map.get("resultMaterial").toString());
+            Map<String, Object>  wmspInboundScanResult =wmsInboundScanResultService.createInboundScanResultByResultMaterial2(mapList.size(),map.get("userName").toString(),map.get("resultMaterial").toString(),""+map.get("hookNo"));
             //判断是否创建成功、成功在添加
             if (wmspInboundScanResult!=null){
                 mapList.add(wmspInboundScanResult);

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

@@ -202,7 +202,7 @@ public class WmspOutboundResultController extends BaseRESTfulController {
             //Map<String, Object> inboundScanResultByResultMaterial = wmsInboundScanResultService.createInboundScanResultByResultMaterial(1, map.get("personnelJobNumber").toString(), map.get("resultMaterial").toString());
            // if (inboundScanResultByResultMaterial==null){
                 //没有入库
-            wmsInboundScanResultService.createInboundScanResultByResultMaterial(new Integer(1),map.get("personnelJobNumber").toString(),map.get("resultMaterial").toString());
+            wmsInboundScanResultService.createInboundScanResultByResultMaterial(new Integer(1),map.get("personnelJobNumber").toString(),map.get("resultMaterial").toString(),""+map.get("hookNo"));
             List<Map<String,Object>> mapList = null;
             mapList= wmsInboundScanResultService.noIssueScanResultList(map.get("personnelJobNumber").toString());
             //传用户名,批次默认为2,仓库id,扫描数据

src/main/java/com/steerinfo/dil/service/IRmsMaterialSteelService.java

@@ -23,14 +23,14 @@ public interface IRmsMaterialSteelService {
      * @param
      * @return
      */
-    Map<String,Object> insertRmsMaterialSteel2(String str) throws ParseException;
+    Map<String,Object> insertRmsMaterialSteel2(String str,String hookNo) throws ParseException;
     /**
      * 新增物资
      * @param
      * @param
      * @return
      */
-    Integer insertRmsMaterialSteel(String str) throws ParseException;
+    Integer insertRmsMaterialSteel(String str,String hookNo) throws ParseException;
 
 
     /*

src/main/java/com/steerinfo/dil/service/IWmsInboundScanResultService.java

@@ -116,7 +116,7 @@ public interface IWmsInboundScanResultService {
     //查询当前用户没有下发的扫描信息
     List<Map<String, Object>> noIssueScanResult(String userName);
     //通过扫描信息创建扫描实绩
-    Map<String, Object> createInboundScanResultByResultMaterial(Integer scanedCount,String userId,String resultMaterial) throws ParseException;
+    Map<String, Object> createInboundScanResultByResultMaterial(Integer scanedCount,String userId,String resultMaterial,String hookNo) throws ParseException;
     List<Map<String, Object>> noIssueScanResultList(String userName);
 //    根据index找到对应的成品并改变其入库状态
     int changeInboundIscomplete(BigDecimal index);
@@ -129,7 +129,7 @@ public interface IWmsInboundScanResultService {
     //通过用户明查询只扫一次的集合
      List<Map<String, Object>> noIssueScanResultList2(String userName);
     //创建只扫一次的扫描实绩
-    Map<String, Object> createInboundScanResultByResultMaterial2(int size, String userName, String resultMaterial) throws ParseException;
+    Map<String, Object> createInboundScanResultByResultMaterial2(int size, String userName, String resultMaterial,String hookNo) throws ParseException;
 
     int isExistInboundScanResult(String substring);
 

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

@@ -51,7 +51,7 @@ public class RmsMaterialSteelServiceImpl implements IRmsMaterialSteelService {
      * @return
      */
     @Override
-    public Integer insertRmsMaterialSteel(String str) throws ParseException {
+    public Integer insertRmsMaterialSteel(String str,String hookNo) throws ParseException {
 
         //将扫描吊牌结果根据分隔符截取字符串
         String[] split = str.split("-");
@@ -121,6 +121,7 @@ public class RmsMaterialSteelServiceImpl implements IRmsMaterialSteelService {
         //设置常规字段
         rmsMaterialSteel.setInsertTime(new Date());
         rmsMaterialSteel.setInsertUsername("admin");
+        rmsMaterialSteel.setUpdateUsername(hookNo);
         rmsMaterialSteelMapper.insertSelective(rmsMaterialSteel);
 
         return rmsMaterialSteel.getId().intValue();
@@ -132,7 +133,7 @@ public class RmsMaterialSteelServiceImpl implements IRmsMaterialSteelService {
      * @return
      */
     @Override
-    public Map<String,Object> insertRmsMaterialSteel2(String str) throws ParseException {
+    public Map<String,Object> insertRmsMaterialSteel2(String str,String hookNo) throws ParseException {
 
         //将扫描吊牌结果根据分隔符截取字符串
         String[] split = str.split("-");
@@ -219,6 +220,7 @@ public class RmsMaterialSteelServiceImpl implements IRmsMaterialSteelService {
         //设置常规字段
         rmsMaterialSteel.setInsertTime(new Date());
         rmsMaterialSteel.setInsertUsername("admin");
+        rmsMaterialSteel.setUpdateUsername(hookNo);
         rmsMaterialSteelMapper.insertSelective(rmsMaterialSteel);
         mi.putAll(JSON.parseObject(JSON.toJSONString(rmsMaterialSteel),new TypeReference<Map<String,Object>>(){}));
         return mi;

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

@@ -269,7 +269,7 @@ public class WmsInboundScanResultServiceImpl implements IWmsInboundScanResultSer
     }
 
     @Override
-    public Map<String, Object> createInboundScanResultByResultMaterial(Integer scanedCount, String userName,String resultMaterial) throws ParseException {
+    public Map<String, Object> createInboundScanResultByResultMaterial(Integer scanedCount, String userName,String resultMaterial,String hookNo) throws ParseException {
         //创建入库扫描实绩、并且给对象赋值
         WmspInboundScanResult wmspInboundScanResult=new WmspInboundScanResult();
         //设置主键自增，这里需要修改
@@ -289,7 +289,7 @@ public class WmsInboundScanResultServiceImpl implements IWmsInboundScanResultSer
         //扫描吊牌信息
         wmspInboundScanResult.setResultLoadTime(new Date());
         //新增钢材物资ID
-        Map<String,Object> materialSteel = rmsMaterialSteelService.insertRmsMaterialSteel2(resultMaterial);
+        Map<String,Object> materialSteel = rmsMaterialSteelService.insertRmsMaterialSteel2(resultMaterial,hookNo);
         wmspInboundScanResult.setMaterialId(new BigDecimal(materialSteel.get("materialSteelId").toString()));
         //创建用户
         //insertUsername
@@ -347,7 +347,7 @@ public class WmsInboundScanResultServiceImpl implements IWmsInboundScanResultSer
             //扫描吊牌信息
             wmspInboundScanResult.setResultLoadTime(new Date());
             //新增钢材物资ID
-            Map<String,Object> materialSteel = rmsMaterialSteelService.insertRmsMaterialSteel2(resultMaterial);
+            Map<String,Object> materialSteel = rmsMaterialSteelService.insertRmsMaterialSteel2(resultMaterial,""+map.get("hookNo"));
             wmspInboundScanResult.setMaterialId(new BigDecimal(materialSteel.get("materialSteelId").toString()));
             //创建用户
             //insertUsername
@@ -399,7 +399,7 @@ public class WmsInboundScanResultServiceImpl implements IWmsInboundScanResultSer
     }
 
     @Override
-    public Map<String, Object> createInboundScanResultByResultMaterial2(int scanedCount, String userName, String resultMaterial) throws ParseException {
+    public Map<String, Object> createInboundScanResultByResultMaterial2(int scanedCount, String userName, String resultMaterial,String hookNo) throws ParseException {
         //创建入库扫描实绩、并且给对象赋值
         WmspInboundScanResult wmspInboundScanResult=new WmspInboundScanResult();
         //设置主键自增，这里需要修改
@@ -415,7 +415,7 @@ public class WmsInboundScanResultServiceImpl implements IWmsInboundScanResultSer
         //扫描吊牌信息
         wmspInboundScanResult.setResultLoadTime(new Date());
         //新增钢材物资ID
-        Map<String,Object> materialSteel = rmsMaterialSteelService.insertRmsMaterialSteel2(resultMaterial);
+        Map<String,Object> materialSteel = rmsMaterialSteelService.insertRmsMaterialSteel2(resultMaterial,hookNo);
         wmspInboundScanResult.setMaterialId(new BigDecimal(materialSteel.get("materialSteelId").toString()));
         //创建用户
         //insertUsername

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

@@ -819,6 +819,7 @@
         RW.WAREHOUSE_NAME "warehouseName",
         RS.STACKING_NO "stackingNo",
         RPG.GRID_GRADATION_NUMBER "gridGradationNumber",
+        rms.UPDATE_USERNAME "hookNo",
         -- 关联炉号
         rms.MATERIAL_FURNACE_NUMBER "furnaceNumber",
         -- 关联物资实际重量