diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java index 6620aae75..d8b1d41b6 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/ProductOutTwoController.java @@ -75,4 +75,11 @@ public class ProductOutTwoController { return new ResponseEntity<>(productOutTwoService.outPointPass(whereJson), HttpStatus.OK); } + @PostMapping("/woodenBoxPoint") + @Log("avg取货点放行") + @SaIgnore + public ResponseEntity woodenBoxPoint(@RequestBody JSONObject whereJson) { + return new ResponseEntity<>(productOutTwoService.woodenBoxPoint(whereJson), HttpStatus.OK); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java index f0a2f472a..d6e1824aa 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/ProductOutTwoService.java @@ -2,6 +2,8 @@ package org.nl.b_lms.pda.service; import com.alibaba.fastjson.JSONObject; +import java.util.List; + /** * @author liuxy * @description 服务接口 @@ -74,4 +76,12 @@ public interface ProductOutTwoService { * @return JSONObject: 返回前端参数 */ JSONObject outPointPass(JSONObject whereJson); + + /** + * 根据子卷号查询可用木箱 + * @param whereJson + * @return + */ + List woodenBoxPoint(JSONObject whereJson); + } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java index bf95ca057..0c0d53299 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/pda/service/impl/ProductOutTwoServiceImpl.java @@ -4,8 +4,12 @@ import cn.hutool.core.util.ObjectUtil; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.extern.slf4j.Slf4j; import org.nl.b_lms.pda.service.ProductOutTwoService; +import org.nl.b_lms.pdm.info.dao.PdmBiOrderbominfo; +import org.nl.b_lms.pdm.info.service.IPdmBiOrderbominfoService; +import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxinfoService; import org.nl.b_lms.storage_manage.database.service.IBstIvtBoxlashboundService; import org.nl.b_lms.storage_manage.database.service.dao.BstIvtBoxlashbound; import org.nl.b_lms.storage_manage.database.service.dao.mapper.BstIvtBoxinfoMapper; @@ -39,6 +43,10 @@ public class ProductOutTwoServiceImpl implements ProductOutTwoService { @Resource private BstIvtBoxinfoMapper bstIvtBoxinfoMapper; + @Autowired + private IPdmBiOrderbominfoService iPdmBiOrderbominfoService; + + @Override public JSONObject ivtQuery(JSONObject whereJson) { return new ProductionOutServiceImpl().ivtQueryTwo(whereJson); @@ -100,7 +108,7 @@ public class ProductOutTwoServiceImpl implements ProductOutTwoService { // 删除木箱绑定关系 iBstIvtBoxlashboundService.remove( new QueryWrapper().lambda() - .eq(BstIvtBoxlashbound::getBound_id, boundDaoList.get(0).getBound_id()) + .eq(BstIvtBoxlashbound::getBound_id, boundDaoList.get(0).getBound_id()) ); JSONObject result = new JSONObject(); @@ -167,4 +175,19 @@ public class ProductOutTwoServiceImpl implements ProductOutTwoService { result.put("message", "成功放行!"); return result; } + + @Override + public List woodenBoxPoint(JSONObject whereJson) { + JSONObject jsonPlan = WQLObject.getWQLObject("pdm_bi_slittingproductionplan") + .query("container_name = '" + whereJson.getString("container_name") + "' and is_delete = '0'") + .uniqueResult(0); + if (ObjectUtil.isNotEmpty(jsonPlan)) { + PdmBiOrderbominfo pdmBiOrderbominfo = iPdmBiOrderbominfoService.getOne(Wrappers.lambdaQuery(PdmBiOrderbominfo.class) + .eq(PdmBiOrderbominfo::getMfgOrder, jsonPlan.getString("mfg_order_name"))); + if (ObjectUtil.isNotEmpty(pdmBiOrderbominfo)) { + return bstIvtBoxinfoMapper.selectProductByName(pdmBiOrderbominfo.getProductName()); + } + } + return null; + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.java index bce3700e7..5041875ab 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.java @@ -42,4 +42,11 @@ public interface BstIvtBoxinfoMapper extends BaseMapper { * @return List */ List getBoxIvtPda(@Param("query") JSONObject query); + + /** + * 根据物料编码查询点位 + * @param productName + * @return + */ + List selectProductByName(String productName); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.xml index 9f25239e5..8d86f30a4 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/database/service/dao/mapper/BstIvtBoxinfoMapper.xml @@ -94,4 +94,20 @@ +