#
lsh
2023-01-31 337f6d74c6b80fdb60f23103f1a8e902628cd978
#
3个文件已修改
26 ■■■■ 已修改文件
src/main/java/com/zy/asrs/mapper/BasDevpMapper.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/BasDevpMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/mapper/BasDevpMapper.java
@@ -16,5 +16,7 @@
    List<Integer> getAvailableOutSite(@Param("typeNo") Integer typeNo);
    List<BasDevp> getLoading(@Param("sour") Integer sour);
    BasDevp selectByWrkNo(Integer wrkNo);
}
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -7,6 +7,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.BasDevpMapper;
import com.zy.asrs.mapper.WrkChargeMapper;
import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
@@ -91,6 +92,8 @@
    private CommonService commonService;
    @Autowired
    private WrkChargeMapper wrkChargeMapper;
    @Autowired
    private BasDevpMapper basDevpMapper;
    /**
     * 组托
@@ -304,18 +307,16 @@
                        case 104:
                        case 108:
                            staNo = 103;
                            BasDevp basDevp1 = basDevpService.selectOne(new EntityWrapper<BasDevp>()
                                    .eq("dev_no", 104).or().eq("dev_no", 108).or().eq("dev_no", 109).eq("loading", "Y"));
                            if (!Cools.isEmpty(basDevp1)){
                            List<BasDevp> basDevps1 = basDevpMapper.getLoading(103);
                            if (basDevps1.size()!=0){
                                continue;
                            }
                            break;
                        case 204:
                        case 208:
                            staNo = 203;
                            BasDevp basDevp2 = basDevpService.selectOne(new EntityWrapper<BasDevp>()
                                    .eq("dev_no", 204).or().eq("dev_no", 208).or().eq("dev_no", 209).eq("loading", "Y"));
                            if (!Cools.isEmpty(basDevp2)){
                            List<BasDevp> basDevps2 = basDevpMapper.getLoading(203);
                            if (basDevps2.size()!=0){
                                continue;
                            }
                            break;
src/main/resources/mapper/BasDevpMapper.xml
@@ -73,4 +73,15 @@
        and wrk_no = #{wrkNo}
    </select>
    <select id="getLoading" resultMap="BaseResultMap">
        select * from dbo.asr_bas_devp where 1=1
        and loading = 'Y'
        <if test="sour > 200">
            and (dev_no = 204 or dev_no = 208 or dev_no = 209)
        </if>
        <if test="sour &lt; 200">
            and (dev_no = 104 or dev_no = 108 or dev_no = 109)
        </if>
    </select>
</mapper>