#

luxiaotao1123

2022-03-28 4a615ac9fb9a871a53ee071bf2046c41e8caad19

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -15,6 +15,7 @@
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;
@@ -27,6 +28,7 @@
/**
 * Created by vincent on 2020/7/6
 */
@Slf4j
@Service
public class WorkLogHandler extends AbstractHandler<String> {

@@ -52,14 +54,12 @@
    @Transactional
    public ReturnT<String> start(WrkMast wrkMast) {
        try {

            // 入库
            if (wrkMast.getWrkSts() == 5) {

                // 全板入库
                if (wrkMast.getIoType() == 1) {
                    String docNum = "PU-" + String.valueOf(snowflakeIdWorker.nextId()).substring(0, 15);
                    // 上报给erp
                    // 单据状态变更 作业中 ===>> 已完成
                    List<MatnrDto> matnrDtos = new ArrayList<>();
                    List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));
                    for (WrkDetl wrkDetl : wrkDetls) {
@@ -78,7 +78,6 @@
                    if (!erpService.uploadBill(dtos, 34, docNum)) {
                        exceptionHandle("无法上报至erp[workNo={0}]失败", wrkMast.getWrkNo());
                    }

                    // 入库通知单
                    if (!Cools.isEmpty(wrkMast.getBarcode())) {
                        // 保存入库通知档历史档
@@ -100,6 +99,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);
@@ -120,6 +120,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);
@@ -136,6 +137,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);
@@ -166,6 +168,7 @@
//                exceptionHandle("删除工作明细档[workNo={0}]失败", wrkMast.getWrkNo());
            }
        } catch (Exception e) {
            log.error("", e);
            e.printStackTrace();
            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
            return FAIL.setMsg(e.getMessage());