|
@@ -193,7 +193,7 @@ public class WmspOutboundResultController extends BaseRESTfulController {
|
|
|
* list:出库单实绩
|
|
|
* */
|
|
|
@Transactional
|
|
|
- @PostMapping(value = "/insertwmspOutboundScanResult6")
|
|
|
+ @PostMapping(value = "/insertwmspOutboundScanResult")
|
|
|
public synchronized RESTfulResult insertwmspOutboundScanResult(@RequestBody(required = false) Map<String, Object> map){
|
|
|
|
|
|
|
|
@@ -202,17 +202,25 @@ public class WmspOutboundResultController extends BaseRESTfulController {
|
|
|
BigDecimal resultId = new BigDecimal(map.get("resultId").toString());
|
|
|
|
|
|
String MaterialOnlyCode=subResultMaterial.split("-")[7];
|
|
|
+
|
|
|
+
|
|
|
|
|
|
int isScan = wmspOutboundResultService.ExistScanResult(subResultMaterial);
|
|
|
|
|
|
Integer materialNumber = wmspOutboundResultMaterialService.isOutboundResultMaterial(MaterialOnlyCode,resultId);
|
|
|
|
|
|
int scanCount = wmspOutboundScanResultService.getScanCount(MaterialOnlyCode,resultId);
|
|
|
- if(isScan==0&&(materialNumber!=null&&materialNumber!=0)&&(materialNumber>scanCount)){
|
|
|
+
|
|
|
+
|
|
|
+ List<Map<String, Object>> list = wmspInboundScanResultMapper.getInboundResultIdByMaterial(subResultMaterial);
|
|
|
+
|
|
|
+ if(list.size()>0&&isScan==0&&(materialNumber!=null&&materialNumber!=0)&&(materialNumber>scanCount)){
|
|
|
|
|
|
|
|
|
BigDecimal personnelId = wmspOutboundResultService.getPersonnelIdByJobnumber(map.get("personnelJobNumber").toString());
|
|
|
- int status= wmspOutboundResultService.createOutboundScanResult(subResultMaterial,personnelId,resultId);
|
|
|
+
|
|
|
+ Map<String, Object> map1 = list.get(0);
|
|
|
+ int status= wmspOutboundResultService.createOutboundScanResult(subResultMaterial,personnelId,resultId,(BigDecimal)map1.get("inboundResultId"));
|
|
|
}
|
|
|
|
|
|
|