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

zc

2024-09-03 b196900d48deefb0129e28df0a842fadc3d6bff1

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

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

@@ -24,6 +24,9 @@

    LocDetl selectItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);

    LocDetl selectItem2(@Param("locNo")String locNo, @Param("matnr")String matnr);


    int deleteItem(@Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);

    int updateAnfme(@Param("anfme")Double anfme, @Param("locNo")String locNo, @Param("matnr")String matnr, @Param("batch")String batch);

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

@@ -16,6 +16,8 @@

    LocDetl selectItem(String locNo, String matnr, String batch);

    LocDetl selectItem2(String locNo, String matnr);

    Page<LocDetl> getStockOut(Page<LocDetl> page);

    /**

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

@@ -133,6 +133,11 @@
    }

    @Override
    public LocDetl selectItem2(String locNo, String matnr) {
        return this.baseMapper.selectItem2(locNo, matnr);
    }

    @Override
    public Double getLocDetlSumQty(String locNo) {
        return this.baseMapper.selectLocDetlSumQty(locNo);
    }

 src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java

@@ -129,7 +129,8 @@
                                    return FAIL.setMsg("全板入库 ===>> 更新订单完成数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                                }
                            }
                        } catch (Exception ignore){}
                        } catch (Exception ignore) {
                        }

                    }
                    // 修改库位状态 S ====>> F
@@ -158,10 +159,13 @@

                        LocDetl locDetl = locDetlService.selectItem(locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
                        if (null != locDetl) {
                            locDetl = locDetlService.selectItem2(locMast.getLocNo(), wrkDetl.getMatnr());
                            if (locDetl != null) {
                            if (!locDetlService.updateAnfme(locDetl.getAnfme() - wrkDetl.getAnfme(), locMast.getLocNo(), wrkDetl.getMatnr(), wrkDetl.getBatch())) {
//                                exceptionHandle("拣料入库 ===>> 修改库存明细数量失败；[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo());
                                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                                return FAIL.setMsg("拣料入库 ===>> 修改库存明细数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                                }
                            }
                        }

@@ -180,7 +184,8 @@
                                    return FAIL.setMsg("拣料入库 ===>> 更新订单完成数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getLocNo() + "]");
                                }
                            }
                        } catch (Exception ignore){}
                        } catch (Exception ignore) {
                        }

                    }
                    // 修改库位状态 Q ====>> F
@@ -363,7 +368,8 @@
                                    return FAIL.setMsg("全板出库 ===>> 更新订单完成数量失败; [workNo=" + wrkMast.getWrkNo() + "],[locNo=" + wrkMast.getSourceLocNo() + "]");
                                }
                            }
                        } catch (Exception ignore){}
                        } catch (Exception ignore) {
                        }
                    }
                    // 删除工作档源库位的库存明细
                    if (!locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", wrkMast.getSourceLocNo()))) {

 src/main/resources/mapper/LocDetlMapper.xml

@@ -80,6 +80,14 @@
        <include refid="batchSeq"></include>
    </select>

    <select id="selectItem2" resultMap="BaseResultMap">
        select top 1 *
        from asr_loc_detl
        where 1=1
        and loc_no = #{locNo}
        and matnr = #{matnr}
    </select>

    <delete id="deleteItem">
        delete from asr_loc_detl
        where 1=1