#

luxiaotao1123

2023-02-01 550842256280ffbca3ffa57107087a8e631623ea

#

 src/main/java/com/zy/asrs/controller/MobileController.java

@@ -365,9 +365,14 @@
    @RequestMapping("/adjustNew/auth")
    @ManagerAuth(memo = "盘点")
    public synchronized R adjustNew(@RequestBody MobileAdjustParam combParam){
        mobileService.adjustNew(combParam, getUserId());
        mobileService.adjustNew(combParam, Boolean.FALSE, getUserId());
        return R.ok("盘点成功");
    }


    @RequestMapping("/adjustNew/v2/auth")
    @ManagerAuth(memo = "补货")
    public synchronized R adjustNewV2(@RequestBody MobileAdjustParam combParam){
        mobileService.adjustNew(combParam, Boolean.TRUE, getUserId());
        return R.ok("补货成功");
    }
}

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

@@ -14,7 +14,8 @@
     * 盘点
     */
    void adjust(MobileAdjustParam param, Long userId);
    void adjustNew(MobileAdjustParam param, Long userId);

    void adjustNew(MobileAdjustParam param, Boolean re, Long userId);

    void packComb(CombParam param, Long userId);


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

@@ -207,7 +207,7 @@
    }
    @Override
    @Transactional
    public void adjustNew(MobileAdjustParam param, Long userId) {
    public void adjustNew(MobileAdjustParam param, Boolean re, Long userId) {
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", param.getBarcode()));
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException("托盘码:"+param.getBarcode()+" 无有效工作档");
@@ -257,7 +257,9 @@
                adjDetl.setOriQty(0.0);
                adjDetlService.insert(adjDetl);
                checkRecord.setAnfme(0.0);
                checkRecordService.insert(checkRecord);
                if (!re) {
                    checkRecordService.insert(checkRecord);
                }
            }else if (wrkDetlOld.getAnfme()!=wrkDetl.getAnfme()){
                wrkDetlService.updateAnfme(wrkDetl.getAnfme(),wrkMast.getWrkNo(),wrkDetl.getMatnr(),wrkDetl.getBatch());
                recordRecordLog=recordRecordLog+"\n"+"更新一条明细:"+"\t商品编号："+wrkDetl.getMatnr()+"\t批号："+wrkDetl.getBatch()+"\t原数量："+wrkDetlOld.getAnfme()+"\t新数量："+wrkDetl.getAnfme();
@@ -265,7 +267,9 @@
                adjDetlService.insert(adjDetl);

                checkRecord.setAnfme(wrkDetlOld.getAnfme());
                checkRecordService.insert(checkRecord);
                if (!re) {
                    checkRecordService.insert(checkRecord);
                }
            }else if (wrkDetlOld.getAnfme()==wrkDetl.getAnfme()){
                recordRecordLog=recordRecordLog+"\n"+"一条明细保持不变:"+"\t商品编号："+wrkDetl.getMatnr()+"\t批号："+wrkDetl.getBatch()+"\t数量："+wrkDetlOld.getAnfme();
                continue;