aysdh

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

@@ -337,8 +337,7 @@ public class WmsInboundResultController extends BaseRESTfulController {
                                      @RequestParam("groupId") BigDecimal groupId,
                                      @RequestParam("personnelWorkshopid") BigDecimal personnelWorkshopid,
                                      @RequestBody(required = false) List<Map<String, Object>> mapList,
-                                     @RequestParam("remark") String remark) {
-
+                                     @RequestParam(required = false) String remark) {
             //遗留 查询批次、以及状态
             int batch=0;
             //需要判断是否已经提交过了 通过resultId判断物质是否已经下发过了跳出、多次下发的结果
@@ -366,7 +365,6 @@ public class WmsInboundResultController extends BaseRESTfulController {
                     }else {
                         return null;
                     }
-
                     //创建一个入库作业实绩
                     WmspInboundResult wmspInboundResult = wmsInboundResultServiceImpl.initAndWmspInboundResult(1,i+1,personnelWorkshopid,groupId,userName,wmspInboundDistribute.getDistributeId(),houseGrid,item,remark);
                     //改变扫码实绩里面的状态

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

@@ -86,7 +86,7 @@ public class WmsInboundScanResultController extends BaseRESTfulController {
 //            }
             mapList= wmsInboundScanResultService.noIssueScanResultList(map.get("userName").toString());
         }
-
+        System.out.println(mapList);
         return success(mapList);
     }
 

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

@@ -179,7 +179,7 @@ public class WmsInboundResultServiceImpl implements IWmsInboundResultService {
         //记录创建时间
         wmspInboundResult.setInsertTime(new Date());
 
-        if(remark != null&&!"null".equals(remark) && !"".equals(remark)){
+        if(remark != null && !"null".equals(remark) && !"".equals(remark)){
             wmspInboundResult.setInsertUpdateRemark(remark);
         }
         //创建序号