#根据1，2楼rgv任务数，分配生成4楼盘点衔接任务

lty

13 小时以前 9e3ac50b27cbbfc6d82da8177a1a8fcf1c009247

#根据1，2楼rgv任务数，分配生成4楼盘点衔接任务

 src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java

@@ -8,5 +8,7 @@
@Mapper
@Repository
public interface WrkMastStaMapper extends BaseMapper<WrkMastSta> {
    Integer wrkCount1();
    Integer wrkCount2();

}

 src/main/java/com/zy/asrs/service/StaDescService.java

@@ -10,6 +10,7 @@
    List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo);

    StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo);
    StaDesc queryCrnStnCheck(Integer typeNo, Integer crnNo, Integer stnNo);

    StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo);


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

@@ -7,14 +7,18 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.StaDesc;
import com.zy.asrs.mapper.StaDescMapper;
import com.zy.asrs.mapper.WrkMastStaMapper;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.StaDescService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.List;

@Service("staDescService")
public class StaDescServiceImpl extends ServiceImpl<StaDescMapper, StaDesc> implements StaDescService {

    @Autowired
    private WrkMastStaMapper wrkMastStaMapper;
    @Override
    public List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo) {
        return this.baseMapper.queryOutStaNosByLocNo(locNo, typeNo);
@@ -34,6 +38,33 @@
    }

    @Override
    public StaDesc queryCrnStnCheck(Integer typeNo, Integer crnNo, Integer stnNo) {
        Integer wrkRgv1 = wrkMastStaMapper.wrkCount1();
        Integer wrkRgv2 = wrkMastStaMapper.wrkCount2();

        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>();

        // ✅ 如果 wrkRgv1 < wrkRgv2，则多加一个条件
        if (wrkRgv1 < wrkRgv2) {
            wrapper.eq("type_no", typeNo)
                    .eq("stn_no", stnNo)
                    .eq("crn_no", crnNo)
                    .lt("crn_stn", 2000);
        }else{
            wrapper.eq("type_no", typeNo)
                    .eq("stn_no", stnNo)
                    .eq("crn_no", crnNo)
                    .gt("crn_stn", 2000);
        }
        StaDesc staDesc = this.selectOne(wrapper);
        if (staDesc == null) {
            throw new CoolException("出库路径不存在");
        }
        return staDesc;
    }


    @Override
    public StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo) {
        Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                .eq("type_no", typeNo)

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

@@ -341,6 +341,10 @@

            // 获取路径
            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
            if(ioType.equals(107)){
                staDesc = staDescService.queryCrnStnCheck(ioType, locMast.getCrnNo(), outSta);
            }

            // 生成工作号
            int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
            // 生成工作档

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

@@ -179,7 +179,7 @@
        wrkMast.setIoType(12);
        wrkMast.setCrnNo(3);
        wrkMast.setBarcode(transplantWork.getBarcode());
        wrkMast.setSourceStaNo(1015);
        wrkMast.setSourceStaNo(transplantWork.getSourceStaNo());
        wrkMast.setStaNo(transplantWork.getStaNo());
        wrkMast.setFullPlt("Y"); // 满板：Y
        wrkMast.setPicking("N"); // 拣料

 src/main/resources/application.yml

@@ -10,8 +10,8 @@
    enabled: false
  datasource:
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
    url: jdbc:sqlserver://10.10.10.235:1433;databasename=jshdasrs
    url: jdbc:sqlserver://127.0.0.1:1433;databasename=jshdasrs
#    url: jdbc:sqlserver://10.10.10.235:1433;databasename=jshdasrs
    username: sa
    password: sa@123
  mvc:

 src/main/resources/mapper/WrkMastStaMapper.xml

@@ -22,4 +22,16 @@

    </resultMap>

    <select id="wrkCount1" resultType="Integer">
        SELECT COUNT(*) FROM asr_wrk_mast_sta WHERE wrk_start &lt; 2000
    </select>


    <select id="wrkCount2" resultType="Integer">
        SELECT COUNT(*)
        FROM asr_wrk_mast_sta
        WHERE wrk_start &gt; 2000
    </select>


</mapper>