diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/PdmBiSlittingproductionplan.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/PdmBiSlittingproductionplan.java index dfcee287e..c42ccf802 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/PdmBiSlittingproductionplan.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/bi/slittingproductionplan/service/dao/PdmBiSlittingproductionplan.java @@ -155,4 +155,6 @@ public class PdmBiSlittingproductionplan implements Serializable { /** 子卷等级*/ private String level; + /** 子卷重量 */ + private String weight; } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java index 45dc04ad4..9ad4e6acd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/rest/AcsToWmsController.java @@ -190,4 +190,11 @@ public class AcsToWmsController { public ResponseEntity sendSubVolumeApply(@RequestBody JSONObject param) { return new ResponseEntity<>(acsToWmsService.sendSubVolumeApply(param), HttpStatus.OK); } + + @PostMapping("/feedbackSubVolumeWeightApply") + @Log(value = "二期ACS反馈子卷重量", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) + @SaIgnore + public ResponseEntity feedbackSubVolumeWeightApply(@RequestBody JSONObject param) { + return new ResponseEntity<>(acsToWmsService.feedbackSubVolumeWeightApply(param), HttpStatus.OK); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java index a897dcb7d..e218bcb78 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/AcsToWmsService.java @@ -181,4 +181,11 @@ public interface AcsToWmsService { * @return / */ JSONObject sendSubVolumeApply(JSONObject param); + + /** + * 二期ACS反馈子卷重量 + * @param param / + * @return / + */ + JSONObject feedbackSubVolumeWeightApply(JSONObject param); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java index 2510ef547..c29b3fce6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java @@ -6,8 +6,10 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.google.common.collect.Interner; import com.google.common.collect.Interners; import lombok.RequiredArgsConstructor; @@ -15,6 +17,8 @@ import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.nl.b_lms.pdm.bi.slittingproductionplan.service.IPdmBiSlittingproductionplanService; +import org.nl.b_lms.pdm.bi.slittingproductionplan.service.dao.PdmBiSlittingproductionplan; import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.point.service.IbstIvtPackageinfoivtService; import org.nl.b_lms.sch.task.dao.SchBaseTask; @@ -130,6 +134,8 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { private final SlitterService slitterService; + private final IPdmBiSlittingproductionplanService slittingproductionplanService; + /** * task_id:任务标识 @@ -2124,7 +2130,26 @@ public class AcsToWmsServiceImpl implements AcsToWmsService { lock.unlock(); } } - return null; + return res; + } + + @Override + public JSONObject feedbackSubVolumeWeightApply(JSONObject param) { + JSONObject res = new JSONObject(); + String subVolume = param.getString("sub_volume"); + String weight = param.getString("weight1"); + LambdaUpdateWrapper updateWrapper = new UpdateWrapper().lambda(); + updateWrapper.set(PdmBiSlittingproductionplan::getWeight, weight) + .eq(PdmBiSlittingproductionplan::getContainer_name, subVolume); + boolean update = slittingproductionplanService.update(updateWrapper); + if (update) { + res.put("code", cn.hutool.http.HttpStatus.HTTP_OK); + res.put("message", "更新成功!"); + } else { + res.put("code", cn.hutool.http.HttpStatus.HTTP_BAD_REQUEST); + res.put("message", "更新失败!"); + } + return res; } }