From 99862b1d333fbbb448ea346551c23b325d7b4963 Mon Sep 17 00:00:00 2001 From: zhang <zc857179121@qq.com> Date: 星期六, 17 五月 2025 09:32:53 +0800 Subject: [PATCH] 接口编写 --- src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java | 67 ++++++++++++++++++++++++++++----- 1 files changed, 57 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java index 20e015d..61405a5 100644 --- a/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java +++ b/src/main/java/com/zy/nc/task/handler/PlanOrderHandler.java @@ -2,14 +2,20 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.zy.asrs.entity.InventoryCheckOrder; +import com.zy.asrs.entity.InventoryCheckOrderDetl; +import com.zy.asrs.entity.param.OpenOrderPakinParam; import com.zy.asrs.entity.param.OpenOrderPakoutParam; import com.zy.asrs.service.OpenService; import com.zy.asrs.task.AbstractHandler; import com.zy.asrs.task.core.ReturnT; import com.zy.common.model.DetlDto; +import com.zy.nc.entity.NccCgCgdhdWms; +import com.zy.nc.entity.NccCkPddWms; import com.zy.nc.entity.NccSaleXsfhmxWms; import com.zy.nc.entity.NccScZkmxbWms; import com.zy.nc.service.NccCgCgdhdWmsService; +import com.zy.nc.service.NccCkPddWmsService; import com.zy.nc.service.NccSaleXsfhmxWmsService; import com.zy.nc.service.NccScZkmxbWmsService; import lombok.extern.slf4j.Slf4j; @@ -31,6 +37,12 @@ @Autowired private NccCgCgdhdWmsService nccCgCgdhdWmsService; + + @Autowired + private NccCkPddWmsService nccCkPddWmsService; + + @Autowired + private Inv nccCkPddWmsService; @Autowired private OpenService openService; @@ -107,26 +119,25 @@ /** - * 杞簱 + * 閲囪喘鍒拌揣 * * @return */ public ReturnT<String> start3() { List<String> strings = nccCgCgdhdWmsService.selectCg(); for (String string : strings) { - OpenOrderPakoutParam param = new OpenOrderPakoutParam(); - param.setOrderType("杞簱"); + OpenOrderPakinParam param = new OpenOrderPakinParam(); + param.setOrderType("閲囪喘鍒拌揣"); DetlDto detlDto; List<DetlDto> orderDetails = new ArrayList<>(); long i = 1; - List<NccScZkmxbWms> wmsFlag = nccScZkmxbWmsService.selectList(new EntityWrapper<NccScZkmxbWms>().eq("vbillcode", string).ne("wms_flag", 1)); - for (NccScZkmxbWms nccScZkmxbWms : wmsFlag) { + List<NccCgCgdhdWms> wmsFlag = nccCgCgdhdWmsService.selectList(new EntityWrapper<NccCgCgdhdWms>().eq("vbillcode", string).ne("wms_flag", 1)); + for (NccCgCgdhdWms nccScZkmxbWms : wmsFlag) { log.info("NccScZkmxbWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms)); - if (nccScZkmxbWms.getDjzt() == 2 && nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getDr() == 0) { + if ( nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getHdr() == 0) { detlDto = new DetlDto(); detlDto.setMatnr(nccScZkmxbWms.getWlbm()); - detlDto.setAnfme(nccScZkmxbWms.getYingzzsl().doubleValue()); - detlDto.setBatch(nccScZkmxbWms.getVbatchcode()); + detlDto.setAnfme(nccScZkmxbWms.getYdzsl().doubleValue()); detlDto.setLineNumber(i); orderDetails.add(detlDto); i++; @@ -135,9 +146,45 @@ } param.setOrderNo(string); param.setOrderDetails(orderDetails); - openService.pakoutOrderCreate(param); - nccScZkmxbWmsService.updateBatchById(wmsFlag); + openService.pakinOrderCreate(param); + nccCgCgdhdWmsService.updateBatchById(wmsFlag); } return SUCCESS; } + + + /** + * 鐩樼偣鍗� + * + * @return + */ + public ReturnT<String> start4() { + List<String> strings = nccCkPddWmsService.selectPdd(); + for (String string : strings) { + InventoryCheckOrder param = new InventoryCheckOrder(); + InventoryCheckOrderDetl checkOrderDetl; + List<InventoryCheckOrderDetl> checkOrderDetls = new ArrayList<>(); + long i = 1; + List<NccCkPddWms> wmsFlag = nccCkPddWmsService.selectList(new EntityWrapper<NccCkPddWms>().eq("vbillcode", string).ne("wms_flag", 1)); + for (NccCkPddWms nccScZkmxbWms : wmsFlag) { + log.info("NccCkPddWms鏁版嵁:{}", JSONObject.toJSON(nccScZkmxbWms)); + if (nccScZkmxbWms.getBdr() == 0 && nccScZkmxbWms.getHdr() == 0) { + checkOrderDetl = new InventoryCheckOrderDetl(); + checkOrderDetl.setMatnr(nccScZkmxbWms.getWlbm()); + checkOrderDetl.setAnfme(nccScZkmxbWms.getZmzsl().doubleValue()); + checkOrderDetl.setBatch(nccScZkmxbWms.getVbatchcode()); + checkOrderDetls.add(checkOrderDetl); + i++; + } + nccScZkmxbWms.setWmsFlag(1); + } + param.setOrderNo(string); + param.setOrderDetails(orderDetails); + openService.pakoutOrderCreate(param); + nccCkPddWmsService.updateBatchById(wmsFlag); + } + return SUCCESS; + } + + } -- Gitblit v1.9.1