|
@@ -66,7 +66,8 @@ public class WmsInboundResultController extends BaseRESTfulController {
|
|
|
|
|
|
@Autowired
|
|
|
ICommonService commonService;
|
|
|
-
|
|
|
+ @Autowired
|
|
|
+ WmsInboundScanResultServiceImpl wmsInboundScanResultService;
|
|
|
|
|
|
|
|
|
* 展示入库实绩
|
|
@@ -128,14 +129,6 @@ public class WmsInboundResultController extends BaseRESTfulController {
|
|
|
@PostMapping("/insertInboundResult")
|
|
|
@Transactional
|
|
|
public RESTfulResult addInvoice(@RequestParam("userName") String userName,@RequestParam("groupId") BigDecimal groupId,@RequestParam("personnelWorkshopid") BigDecimal personnelWorkshopid, @RequestBody(required = false) List<Map<String, Object>> mapList) {
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
|
|
|
Map<String,Object> conditionMap=wmsInboundResultServiceImpl.selectInboundResultByGroupId(groupId);
|
|
|
|
|
@@ -145,13 +138,13 @@ public class WmsInboundResultController extends BaseRESTfulController {
|
|
|
if ((conditionMap!=null&&conditionMap.get("userName").toString().equals(userName)&&conditionMap.get("resultStatus").toString().equals("1"))){
|
|
|
return success("请勿重复提交");
|
|
|
}
|
|
|
+
|
|
|
|
|
|
if (conditionMap!=null&&!conditionMap.get("userName").toString().equals(userName)&&conditionMap.get("resultStatus").toString().equals("1")){
|
|
|
-
|
|
|
|
|
|
for (int i=0;i<mapList.size();i++){
|
|
|
Map<String,Object> item=mapList.get(i);
|
|
|
-
|
|
|
+
|
|
|
BigDecimal houseGrid = wmsInboundResultServiceImpl.getGrid(conditionMap.get("distributeId").toString(), i+1);
|
|
|
|
|
|
if (houseGrid==null){
|
|
@@ -159,9 +152,8 @@ public class WmsInboundResultController extends BaseRESTfulController {
|
|
|
|
|
|
wmspGridMaterialService.initInsertWmspGridMaterial(item,houseGrid);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
- WmspInboundResult wmspInboundResult = wmsInboundResultServiceImpl.initAndWmspInboundResult(i+1,personnelWorkshopid,groupId,userName,new BigDecimal(conditionMap.get("distributeId").toString()),houseGrid,item);
|
|
|
+
|
|
|
+ WmspInboundResult wmspInboundResult = wmsInboundResultServiceImpl.initAndWmspInboundResult(0,i+1,personnelWorkshopid,groupId,userName,new BigDecimal(conditionMap.get("distributeId").toString()),houseGrid,item);
|
|
|
|
|
|
int status= wmsInboundScanResultServiceImpl.updateInboundScanStatus(new BigDecimal(item.get("resultId").toString()),wmspInboundResult.getInboundId());
|
|
|
|
|
@@ -169,7 +161,7 @@ public class WmsInboundResultController extends BaseRESTfulController {
|
|
|
int status2= wmsInboundResultServiceImpl.updateInboundStatus(new BigDecimal(conditionMap.get("distributeId").toString()));
|
|
|
}
|
|
|
}
|
|
|
- return success();
|
|
|
+ return success("下发成功");
|
|
|
|
|
|
}else{
|
|
|
|
|
@@ -177,25 +169,47 @@ public class WmsInboundResultController extends BaseRESTfulController {
|
|
|
if(resultStatus==1){
|
|
|
return success("请勿重复下发");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
WmspInboundDistribute wmspInboundDistribute=wmspInboundDistributeService.initAndCreateInboundDistribute(personnelWorkshopid,groupId,userName,batch);
|
|
|
+
|
|
|
+ BigDecimal count = wmsInboundScanResultService.selectMaterialTypeByMaterialId(new BigDecimal(mapList.get(0).get("materialId").toString()));
|
|
|
+ if (count!=null){
|
|
|
+
|
|
|
+ for (int i=0;i<mapList.size();i++){
|
|
|
|
|
|
-
|
|
|
- for (int i=0;i<mapList.size();i++){
|
|
|
- Map<String,Object> item=mapList.get(i);
|
|
|
-
|
|
|
-
|
|
|
- BigDecimal houseGrid = rmsPwarehouseGridService.selectGrid(mapList.size()-1, personnelWorkshopid);
|
|
|
-
|
|
|
-
|
|
|
- WmspInboundResult wmspInboundResult = wmsInboundResultServiceImpl.initAndWmspInboundResult(i+1,personnelWorkshopid,groupId,userName,wmspInboundDistribute.getDistributeId(),houseGrid,item);
|
|
|
-
|
|
|
- int status= wmsInboundScanResultServiceImpl.updateInboundScanStatus(new BigDecimal(item.get("resultId").toString()),wmspInboundResult.getInboundId());
|
|
|
+ Map<String,Object> item=mapList.get(i);
|
|
|
+
|
|
|
+ BigDecimal houseGrid = rmsPwarehouseGridService.selectGrid(mapList.size()-1, personnelWorkshopid);
|
|
|
+
|
|
|
+ WmspInboundResult wmspInboundResult = wmsInboundResultServiceImpl.initAndWmspInboundResult(0,i+1,personnelWorkshopid,groupId,userName,wmspInboundDistribute.getDistributeId(),houseGrid,item);
|
|
|
+
|
|
|
+ int status= wmsInboundScanResultServiceImpl.updateInboundScanStatus(new BigDecimal(item.get("resultId").toString()),wmspInboundResult.getInboundId());
|
|
|
+
|
|
|
+ wmspGridMaterialService.initInsertWmspGridMaterial(item,houseGrid);
|
|
|
+
|
|
|
+ }
|
|
|
+ }else {
|
|
|
+
|
|
|
+
|
|
|
+ for (int i=0;i<mapList.size();i++) {
|
|
|
+
|
|
|
+ Map<String, Object> item = mapList.get(i);
|
|
|
+
|
|
|
+ BigDecimal houseGrid = rmsPwarehouseGridService.selectGrid(mapList.size() - 1, personnelWorkshopid);
|
|
|
+
|
|
|
+ WmspInboundResult wmspInboundResult = wmsInboundResultServiceImpl.initAndWmspInboundResult(1, i + 1, personnelWorkshopid, new BigDecimal(0), userName, wmspInboundDistribute.getDistributeId(), houseGrid, item);
|
|
|
+
|
|
|
+ int status = wmsInboundScanResultServiceImpl.updateInboundScanStatus(new BigDecimal(item.get("resultId").toString()), wmspInboundResult.getInboundId());
|
|
|
+
|
|
|
+ wmspGridMaterialService.initInsertWmspGridMaterial(item, houseGrid);
|
|
|
+
|
|
|
+ if(mapList.size()==i+1){
|
|
|
+ int status2= wmsInboundResultServiceImpl.updateInboundStatus(wmspInboundDistribute.getDistributeId());
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
-
|
|
|
- wmspGridMaterialService.initInsertWmspGridMaterial(item,houseGrid);
|
|
|
}
|
|
|
- return success(null);
|
|
|
+ return success("下发成功");
|
|
|
}
|
|
|
|
|
|
}
|