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

whycq

2024-04-25 4730f1401024822fbdf5c020a54a2e6c8ab70b3a

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

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

@@ -113,4 +113,9 @@
    public List<WrkMast> selectWrkIoType(@Param("crnNo") Integer crnNo);

    public  List<WrkMast> selectWaitPakIn(@Param("wrkNos")List<Integer> wrkNos);

    /**
     * 查询是否是盘点出库，检料出库
     */
    WrkMast selectpj(@Param("staNo")Integer staNo,@Param("barcode")String barcode);
}

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

@@ -167,7 +167,10 @@
                    staProtocol.setStaNo(inSta.getBackSta().shortValue());
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
                }



                // 判断是否满足入库条件
                if (staProtocol.isAutoing()
@@ -179,16 +182,22 @@
                    if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
                        News.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);
                        //条码为空或者不符合，退库到172站点
//                        staProtocol.setWorkNo((short)9999);
//                        staProtocol.setStaNo((short)172);
//                        devpThread.setPakMk(staProtocol.getSiteId(), false);
//                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
//                        if (!result) {
//                            throw new CoolException("更新plc站点信息失败");
//                        }
                        staProtocol.setWorkNo(wrkNo);
                        staProtocol.setStaNo(inSta.getBackSta().shortValue());
                        wrkNo++;
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        if (!result) {
                            throw new CoolException("更新plc站点信息失败");
                        }
                        continue;
                    }

                    //判断101和104是否是拣料、并板、盘点再入库   设备暂不支持101、104站盘点/拣料入库
                    WrkMast wrkMast1=wrkMastMapper.selectpj(inSta.getStaNo(),barcode);
                    if( !Cools.isEmpty(barcode)&&!Cools.isEmpty(wrkMast1)){
                        log.error("101或104拣料、并板、盘点再入库", wrkMast1.getWrkNo());
                        continue;
                    }
                    // 判断重复工作档
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
                    if (wrkMast != null) {
@@ -202,7 +211,7 @@

                    WrkMast checkPick = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                            .eq("barcode", barcode)
                            .in("io_type", 107,103));
                            .in("io_type", 107,103,57,53));
                    if (!Cools.isEmpty(checkPick)) {
                        continue;
                    }
@@ -241,6 +250,8 @@
                                News.error(methodName + ":更新plc站点信息失败");

                                throw new CoolException("更新plc站点信息失败");
                            }else {
                                ledThread.errorReset();
                            }


@@ -421,7 +432,7 @@

                if (!Cools.isEmpty(barcode)) {
//                    log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
                    if ("NG".endsWith(barcode) || "NoRead".equals(barcode) ) {
                        if (!staProtocol.isLoading()) {
                            continue;
                        }
@@ -538,12 +549,16 @@
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        continue;
                    }

                    if (ledThread != null) {
                        ledThread.errorReset();
                    }
                    // 更新站点信息 且 下发plc命令
                    staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                    staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));


                    if (!result) {
                        News.error(methodName + ":发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());

@@ -1820,9 +1835,7 @@
                        Double total = 0.0;
                        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
                        LocDetl locDetl = locDetlService.selectOne(wrapper.eq("zpallet", wrkDetl.getZpallet()).eq("matnr", wrkDetl.getMatnr()));
                        if (Cools.isEmpty(locDetl)) {
                            total = wrkDetl.getAnfme();
                        } else {
                        if (!Cools.isEmpty(locDetl)) {
                            total = locDetl.getAnfme();
                        }
                        if (wrkMast.getIoType() == 101) {

 src/main/resources/mapper/WrkDetlMapper.xml

@@ -27,7 +27,7 @@
    </resultMap>

    <select id="findByWorkNo" resultMap="BaseResultMap">
        select wrk_no, matnr, maktx, anfme from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
        select * from asr_wrk_detl where 1=1 and wrk_no = #{workNo}
    </select>

    <update id="updateIoTime">

 src/main/resources/mapper/WrkMastMapper.xml

@@ -199,4 +199,8 @@
        where crn_no=#{crnNo} and wrk_sts=11 and io_type>100
        order by io_pri desc,io_time desc,wrk_no ASC
    </select>

    <select id="selectpj" resultMap="BaseResultMap">
        select * from dbo.asr_wrk_mast where sta_no=#{staNo} and wrk_sts =14 and barcode=#{barcode}
    </select>
</mapper>