#

Junjie

20 小时以前 988ac4e6d57fd550bcd34bc6227f900aef7b0f6b

 src/main/java/com/zy/common/web/WcsController.java

@@ -19,6 +19,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.ReactiveTypeDescriptor;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

@@ -103,6 +104,18 @@
            if (Cools.isEmpty(param.getBarcode())) {
                return R.error("条码不能为空");
            }

            WrkMast wrkMast1 = wrkMastService.selectByBarcode(param.getBarcode());
            if (wrkMast1 != null) {
                StartupDto startupDto = new StartupDto();
                startupDto.setTaskNo(wrkMast1.getWrkNo());
                startupDto.setSourceStaNo(wrkMast1.getSourceStaNo());
                startupDto.setTaskPri(wrkMast1.getIoPri());
                startupDto.setCrnNo(wrkMast1.getCrnNo());
                startupDto.setLocNo(Utils.locToLocNo(wrkMast1.getLocNo()));
                return R.ok().add(startupDto);
            }

            waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
            if (Cools.isEmpty(waitPakins)) {
                WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
@@ -181,6 +194,7 @@
                        return R.error("修改工作档失败====>14");
                    }
                }
                break;
            case "task_cancel":
                workService.cancelWrkMast(notifyDto.getSuperTaskNo(), 9527L);
        }
@@ -330,7 +344,7 @@
            }
        });
        // 更新入库通知档 ioStatus ===>> Y
        if (!waitPakinService.updateIoStatus("Y", dto.getLocNo(), barcode)) {
        if (!waitPakinService.updateIoStatus("Y", loc(dto.getLocNo()), barcode)) {
            throw new CoolException("更新通知档失败");
        }
        // 更新源站点信息