Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs

whycq

2024-09-10 bfeba8a69c0234a88eb71a1d2a7bf4b2aa0cd67a

Merge remote-tracking branch 'origin/phpsasrs' into phpsasrs

# Conflicts:
#	src/main/resources/application.yml

 pom.xml

@@ -30,7 +30,7 @@
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-tomcat</artifactId>
            <scope>provided</scope>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -434,6 +434,10 @@
                    .eq("crn_no", locMast.getCrnNo());
            StaDesc staDesc = staDescService.selectOne(wrapper);
            Integer sourceStaNo = staDesc.getCrnStn();
            WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", locMast.getLocNo()));
            if (!Cools.isEmpty(mast)) {
                throw new CoolException(locNo+"已有出库任务！");
            }
            if (Cools.isEmpty(sourceStaNo)) {
                throw new CoolException("检索源站失败");
            }
@@ -444,7 +448,7 @@
            wrkMast.setIoTime(now);
            wrkMast.setWrkSts(11L); // 工作状态：11.生成出库ID
            wrkMast.setIoType(110); // 入出库状态： 110.空板出库
            wrkMast.setIoPri(10D);
            wrkMast.setIoPri(13D);
            wrkMast.setSourceStaNo(sourceStaNo); // 源站
            wrkMast.setStaNo(param.getOutSite()); // 目标站
            wrkMast.setCrnNo(locMast.getCrnNo());