From 168aa783b5eaf7f1cb34be67b7d3f9d7fda13bd2 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期三, 23 三月 2022 09:36:59 +0800 Subject: [PATCH] #杰克缝纫机立库 【添加订单状态模块】 --- src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java index 07e740c..8fa6859 100644 --- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java +++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java @@ -1,8 +1,10 @@ package com.zy.asrs.task.handler; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.core.common.Cools; import com.core.common.SnowflakeIdWorker; +import com.zy.asrs.entity.RequestLog; import com.zy.asrs.entity.WaitPakin; import com.zy.asrs.entity.WrkDetl; import com.zy.asrs.entity.WrkMast; @@ -15,18 +17,21 @@ import com.zy.common.service.wms.ReplenishDto; import com.zy.common.service.wms.Result; import com.zy.common.service.wms.WmsService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Optional; /** * Created by vincent on 2020/7/6 */ +@Slf4j @Service public class WorkLogHandler extends AbstractHandler<String> { @@ -78,7 +83,6 @@ if (!erpService.uploadBill(dtos, 34, docNum)) { exceptionHandle("鏃犳硶涓婃姤鑷砮rp[workNo={0}]澶辫触", wrkMast.getWrkNo()); } - // 鍏ュ簱閫氱煡鍗� if (!Cools.isEmpty(wrkMast.getBarcode())) { // 淇濆瓨鍏ュ簱閫氱煡妗e巻鍙叉。 @@ -100,6 +104,7 @@ ReplenishDto param = new ReplenishDto(); param.setMatnr(wrkDetl.getMatnr()); param.setCount(wrkDetl.getAnfme()); + param.setWorkNo(wrkMast.getWrkNo()); replenishDtos.add(param); } Result result = wmsService.replenish(replenishDtos); @@ -113,13 +118,14 @@ // 鍑哄簱 } else if (wrkMast.getWrkSts() == 15) { // 闈為攢鍞鍗曞嚭搴擄紝闇�瑕佽ˉ璐у埌骞充粨 - if (!wrkMast.getPdcType().equals("Y")) { + if (Cools.isEmpty(wrkMast.getPdcType()) || !wrkMast.getPdcType().equals("Y")) { List<ReplenishDto> replenishDtos = new ArrayList<>(); List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo())); for (WrkDetl wrkDetl : wrkDetls) { ReplenishDto param = new ReplenishDto(); param.setMatnr(wrkDetl.getMatnr()); param.setCount(wrkDetl.getAnfme()); + param.setWorkNo(wrkMast.getWrkNo()); replenishDtos.add(param); } Result result = wmsService.replenish(replenishDtos); @@ -136,6 +142,7 @@ ReplenishDto param = new ReplenishDto(); param.setMatnr(wrkDetl.getMatnr()); param.setCount(more); + param.setWorkNo(wrkMast.getWrkNo()); List<ReplenishDto> replenishDtos = new ArrayList<>(); replenishDtos.add(param); Result result = wmsService.replenish(replenishDtos); -- Gitblit v1.9.1