zx 2 rokov pred
rodič
commit
e13eb1c847

+ 2 - 3
src/main/java/com/steerinfo/dil/controller/WmshOutboundResultController.java

@@ -70,14 +70,13 @@ public class WmshOutboundResultController extends BaseRESTfulController {
     @ApiOperation(value="添加港存库出库实绩")
     @PostMapping("/addResult")
     public RESTfulResult addResult(@RequestBody(required = false) Map<String, Object> map) throws Exception {
-        wmshOutboundResultService.addResult(map);
+        int result = wmshOutboundResultService.addResult(map);
         map.put("status", new BigDecimal(0));
         int i1 = wmshGridMaterialService.updatePortStock(map);
         if (i1 == -1){
             return failed("出库数量大于港存库实时库存");
     }else {
-
-            return success();
+            return success(result);
         }
     }
 }

+ 2 - 1
src/main/java/com/steerinfo/dil/service/impl/WmshOutboundResultServiceImpl.java

@@ -69,6 +69,7 @@ public class WmshOutboundResultServiceImpl implements IWmshOutboundResultService
         wmshOutboundResult.setHarborId(DataChange.dataToBigDecimal(map.get("portId")));
         wmshOutboundResult.setResultClearing((String)(map.get("isClean")));
         wmshOutboundResult.setInsertTime(new Date());
-        return wmshOutboundResultMapper.insertSelective(wmshOutboundResult);
+        wmshOutboundResultMapper.insertSelective(wmshOutboundResult);
+        return  id;
     }
 }

+ 2 - 2
src/main/resources/com/steerinfo/dil/mapper/WmshGridMaterialMapper.xml

@@ -484,9 +484,9 @@
         from TMSTRAIN_LOADING_TEMP TLT
                  left join AMS_PURCHASE_ORDER APO
                            on TLT.PURCHASE_ORDER_NO = APO.PURCHASE_ORDER_NO
-                 left join DIL_BATCH DB
-                           on DB.BATCH_ID = APO.BATCH_ID
                  left join WMSH_OUTBOUND_RESULT WOR
+                           on TLT.OUTBOUNT_ID = WOR.RESULT_ID
+                 left join DIL_BATCH DB
                            on DB.BATCH_ID = WOR.BATCH_ID
                  left join RMS_MATERIAL RM
                            on RM.MATERIAL_ID = DB.MATERIAL_ID