wudingsheng 4 napja
szülő
commit
d5000c8a3a

+ 4 - 3
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionReadyCenter/service/impl/MMeterialReceiveLogServiceImpl.java

@@ -87,10 +87,11 @@ public class MMeterialReceiveLogServiceImpl extends SuperServiceImpl<MMeterialRe
     @Transactional(rollbackFor = Exception.class)
     public R syncStock(MMeterial log) {
         // 1) 参数校验与组装 materialCodeList
-        if (log == null || ObjectUtil.isEmpty(log.getMeterialCode())) {
+        /*if (log == null || ObjectUtil.isEmpty(log.getMeterialCode())) {
             return R.fail("materialCode 不能为空");
-        }
-        List<String> materialCodeList = Collections.singletonList(log.getMeterialCode());
+        }*/
+        MMeterial meterial = mMeterialMapper.selectOne(Wraps.<MMeterial>lbQ().eq(MMeterial::getId, log.getId()));
+        List<String> materialCodeList = Collections.singletonList(meterial.getMeterialCode());
 
         JSONObject req = new JSONObject();
         req.put("materialCodeList", materialCodeList);

+ 2 - 2
imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionReadyCenter/MMeterialController.java

@@ -104,8 +104,8 @@ public class MMeterialController extends SuperController<MMeterialService, Long,
     @ApiOperation(value = "获取原材料", notes = "获取原材料")
     @PostMapping("/get")
     public R<MMeterial> getById(@RequestBody MMeterial model) {
-        //MMeterial mMeterial = baseService.getById(model.getId());
-        MMeterial mMeterial = baseService.asncStock(model);
+        MMeterial mMeterial = baseService.getById(model.getId());
+        //MMeterial mMeterial = baseService.asncStock(model);
         return success(mMeterial);
     }