diff --git a/lms/nladmin-system/README.md b/lms/nladmin-system/README.md index ba4e314..0bf3f83 100644 --- a/lms/nladmin-system/README.md +++ b/lms/nladmin-system/README.md @@ -12,4 +12,6 @@ ### String处理工具类 - 判断String中的空格并转换List -org.nl.common.utils.StringDealUtils#splitString(String xxx) +org.nl.common.utils.StringDealUtils#splitString(String input) +- Stream的map操作 + org.nl.common.utils.CollectionUtils#mapList(Collection from, Function func) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java index 02e61e2..aaec318 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java @@ -3,6 +3,7 @@ package org.nl.b_lms.bst.ivt.cutpointivt.service; import com.baomidou.mybatisplus.core.metadata.IPage; import org.nl.b_lms.bst.ivt.cutpointivt.service.dto.BstIvtCutpointivtQuery; import org.nl.b_lms.bst.ivt.cutpointivt.service.dto.CutpointAirShhaftDto; +import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto; import org.nl.common.domain.query.PageQuery; import com.baomidou.mybatisplus.extension.service.IService; @@ -65,13 +66,12 @@ public interface IBstIvtCutpointivtService extends IService { List getAreaNotTaskPointByStatusNotCheckPickUpCompleted(String type, String pointStatus, String area, String sort); /** - * 获取同尺寸的气涨轴 - * @param type 点位类型：1套轴对接位，2分切缓存位，3分切对接位，4套轴异常位 - * @param size 气涨轴尺寸 - * @param generation 代数（4：小，5：大） + * 获取空的子卷下线满轴位点 + * @param point_status 点位类型：1套轴对接位，2分切缓存位，3分切对接位，4套轴异常位 + * @param ivt_status 气涨轴尺寸 * @return / */ - List getPointByTypeAndShaftSize(String type, String size, String generation); + List getPointByStatus(String point_status, String ivt_status); /** * 根据桁架对应的点位编码获取点位实体 diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java index ff571da..952febb 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java @@ -3,6 +3,7 @@ package org.nl.b_lms.bst.ivt.cutpointivt.service.dao.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt; import org.nl.b_lms.bst.ivt.cutpointivt.service.dto.CutpointAirShhaftDto; +import org.nl.b_lms.sch.point.dao.BstIvtPackageinfoivt; import org.nl.b_lms.sch.tasks.slitter.mapper.dto.SlitterPlanDistinctDto; import java.util.List; @@ -15,7 +16,7 @@ public interface BstIvtCutpointivtMapper extends BaseMapper { List getAreaNotTaskPointByStatus(String type, String pointStatus, String area, String sort); - List getPointByTypeAndShaftSize(String type, String size, String generation); + List getPointByStatus(String point_status, String ivt_status); List getAreaNotTaskPointByLocationAreaAndStatus(String location); diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml index 33da3dd..3922835 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml @@ -26,26 +26,19 @@ - SELECT bc.* - FROM `bst_ivt_cutpointivt` bc - LEFT JOIN pdm_bi_slittingproductionplan pp ON pp.qzzno = bc.qzz_no1 - OR pp.qzzno = bc.qzz_no2 - WHERE bc.point_type = #{type} - AND IFNULL(pp.qzzno,'') ]]> '' - AND pp.qzz_size = #{size} - - AND pp.qzz_generation = #{generation} - + FROM `bst_ivt_packageinfoivt` bc + WHERE bc.point_status = #{point_status} + AND bc.ivt_status = #{ivt_status} AND bc.is_used = '1' - AND bc.point_status = '3' - AND IFNULL(pp.workorder_id,'') ]]> '' AND 0 = (SELECT COUNT(*) FROM sch_base_task t WHERE t.task_status '07' AND t.is_delete = '0' - AND (t.point_code1 = bc.truss_point_code1 OR t.point_code1 = bc.truss_point_code2)) + AND (t.point_code1 = bc.point_code OR t.point_code2 = bc.point_code OR t.point_code3 = bc.point_code OR t.point_code4 = bc.point_code)) + order by bc.sort_seq + diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/st/service/StIvtStructivtService.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/st/service/StIvtStructivtService.java index 1c8daf3..d0482ec 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/st/service/StIvtStructivtService.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/st/service/StIvtStructivtService.java @@ -1,8 +1,10 @@ package org.nl.b_lms.storage_manage.st.service; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import org.apache.ibatis.annotations.Param; +import org.nl.b_lms.storage_manage.ios.service.iostorInv.dto.InventoryQueryParam; import org.nl.b_lms.storage_manage.st.dao.StIvtStructivt; import org.nl.common.domain.query.PageQuery; import org.nl.wms.basedata.st.service.dto.ProductStoreDownDto; @@ -63,4 +65,11 @@ public interface StIvtStructivtService extends IService { * @return */ StIvtStructivt getOneByPcsn(String pcsn, boolean throwEx); + + /** + * 获取所有库存信息 + * @param param + * @return + */ + List getAllInventorys(InventoryQueryParam param); } diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/st/service/impl/StIvtStructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/st/service/impl/StIvtStructivtServiceImpl.java index 21888dd..5e2085e 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/st/service/impl/StIvtStructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/st/service/impl/StIvtStructivtServiceImpl.java @@ -1,9 +1,11 @@ package org.nl.b_lms.storage_manage.st.service.impl; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.nl.b_lms.storage_manage.ios.service.iostorInv.dto.InventoryQueryParam; import org.nl.b_lms.storage_manage.st.dao.StIvtStructivt; import org.nl.b_lms.storage_manage.st.dao.mapper.StIvtStructivtMapper; import org.nl.b_lms.storage_manage.st.service.StIvtBsrealstorattrService; @@ -71,4 +73,9 @@ public class StIvtStructivtServiceImpl extends ServiceImpl getAllInventorys(InventoryQueryParam param) { + return stIvtStructivtMapper.getAllInventorys(param); + } } diff --git a/lms/nladmin-system/src/main/java/org/nl/common/utils/CollectionUtils.java b/lms/nladmin-system/src/main/java/org/nl/common/utils/CollectionUtils.java new file mode 100644 index 0000000..a747cfe --- /dev/null +++ b/lms/nladmin-system/src/main/java/org/nl/common/utils/CollectionUtils.java @@ -0,0 +1,22 @@ +package org.nl.common.utils; + +import cn.hutool.core.collection.CollUtil; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * @Author: lyd + * @Date: 2025/6/20 + */ +public class CollectionUtils { + public static List mapList(Collection from, Function func) { + if (CollUtil.isEmpty(from)) { + return new ArrayList<>(); + } + return from.stream().map(func).collect(Collectors.toList()); + } +} 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 52e0c54..1245850 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 @@ -155,7 +155,7 @@ public class AcsToWmsController { } @PostMapping("/sendSubVolumeApply") - @Log(value = "二期内包间送子卷请求", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) + @Log(value = "二期套管工位请求判断去成品还是废箔", isInterfaceLog = true, interfaceLogType = InterfaceLogType.ACS_TO_LMS) @SaIgnore public ResponseEntity sendSubVolumeApply(@RequestBody JSONObject param) { return new ResponseEntity<>(acsToWmsService.sendSubVolumeApply(param), HttpStatus.OK); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java index 23b9e06..75cbf7a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java @@ -2,6 +2,7 @@ package org.nl.wms.st.outbill.rest; import com.alibaba.fastjson.JSONObject; import lombok.extern.slf4j.Slf4j; +import org.nl.b_lms.storage_manage.ios.enums.IOSEnum; import org.nl.b_lms.storage_manage.ios.service.iostorInv.IStIvtIostorinvOutService; import org.nl.common.TableDataInfo; import org.nl.common.domain.query.PageQuery; @@ -17,6 +18,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Map; /** * 出库单管理 @@ -72,4 +74,33 @@ public class CheckOutBillController { public ResponseEntity getInvTypes() { return new ResponseEntity<>(dictService.getInvTypes(), HttpStatus.OK); } + @GetMapping("/getOutBillDis2") + @Log("查询未出库单分配") + public ResponseEntity getOutBillDis2(@RequestParam Map whereJson) { + return new ResponseEntity<>(checkOutBillService.getOutBillDis2(whereJson), HttpStatus.OK); + } + @PostMapping("/allDiv") + @Log("出库单全部分配") + public ResponseEntity allDiv(@RequestBody JSONObject whereJson) { + iStIvtIostorinvOutService.allDiv(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @GetMapping("/getOutBillTask") + @Log("查询出库单分配任务") + public ResponseEntity getOutBillTask(@RequestParam Map whereJson) { + return new ResponseEntity<>(checkOutBillService.getOutBillTask(whereJson), HttpStatus.OK); + } + @PostMapping("/allDivOne") + @Log("出库单自动分配") + public ResponseEntity allDivOne(@RequestBody JSONObject whereJson) { + iStIvtIostorinvOutService.allDiv(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + @PostMapping("/allCancel") + @Log("出库单全部取消") + public ResponseEntity allCancel(@RequestBody JSONObject whereJson) { + iStIvtIostorinvOutService.cancelDiv(whereJson); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java index 257ada2..cddae02 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/CheckOutBillService.java @@ -14,6 +14,7 @@ import org.nl.wms.st.outbill.service.vo.OutBillTaskVo; import org.nl.wms.st.outbill.service.vo.StockMaterialVo; import java.util.List; +import java.util.Map; /** * @Author: lyd @@ -50,4 +51,14 @@ public interface CheckOutBillService { * @return */ JSONArray queryBox(JSONObject whereJson); + + JSONArray getOutBillDis2(Map whereJson); + + /** + * 查询出库单分配任务 + * + * @param whereJson / + * @return + */ + JSONArray getOutBillTask(Map whereJson); } diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java index 64149a8..d0d1e3a 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java @@ -29,8 +29,10 @@ import org.nl.wms.stat.service.vo.PastStructPageVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; import java.util.HashSet; import java.util.List; +import java.util.Map; /** * @Author: lyd @@ -125,4 +127,30 @@ public class CheckOutBillServiceImpl implements CheckOutBillService { } return array; } + + @Override + public JSONArray getOutBillDis2(Map whereJson) { + whereJson.put("flag", "52"); + JSONArray jo = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParamMap((HashMap) whereJson) + .process() + .getResultJSONArray(0); + return jo; + } + @Override + public JSONArray getOutBillTask(Map whereJson) { + HashMap map = new HashMap<>(whereJson); + map.put("flag", "10"); + if ("true".equals(map.get("checked"))) { + map.put("task_status", "99"); + } + JSONArray jo = new JSONArray(); + if (map.containsKey("iostorinvdtl_id")) { + jo = WQL.getWO("QST_IVT_CHECKOUTBILL") + .addParamMap(map) + .process() + .getResultJSONArray(0); + } + return jo; + } }