#

whycq

2023-05-21 6056bddb23fe640fe2833e8113bccc32ba004c80

#

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

@@ -108,11 +108,11 @@
                String barcode = barcodeThread.getBarcode();

                ////判断101和104是否是拣料、并板、盘点再入库
                //WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
                //if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) &&!Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
                //    log.error("101或104拣料、并板、盘点再入库", wrkMast1.getWrkNo());
                //    continue;
                //}
                WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
                if((inSta.getStaNo().equals(101) || inSta.getStaNo().equals(104)) &&!Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
                    log.error("101或104拣料、并板、盘点再入库", wrkMast1.getWrkNo());
                    continue;
                }

                if (!Cools.isEmpty(barcode)) {
                    log.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
@@ -181,12 +181,12 @@
                            continue;
                        }
                    }
                    // 获取入库通知档
//                    List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
//                    if (waitPakins.isEmpty()) {
//                        log.error("无此入库条码数据。条码号={}", barcode);
//                        continue;
//                    }
//                     获取入库通知档
                    List<WaitPakin> waitPakins = waitPakinMapper.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", barcode).eq("io_status", "N"));
                    if (waitPakins.isEmpty()) {
                        log.error("无此入库条码数据。条码号={}", barcode);
                        continue;
                    }

                    try {
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

 src/main/resources/mapper/WrkMastMapper.xml

@@ -193,6 +193,6 @@
        select top 1 * from dbo.asr_wrk_mast where  io_type = 110 and sta_no = #{staNo} order by io_time,wrk_no
    </select>
    <select id="selectpj" resultMap="BaseResultMap">
        select * from dbo.asr_wrk_mast where sta_no=#{staNo} and wrk_sts =14 and barcode=#{barcode}
        select * from dbo.asr_wrk_mast where  wrk_sts =14 and barcode=#{barcode}
    </select>
</mapper>