#

mrzhssss

2022-12-06 ad9d0659df900595fd3f2d12c42fe42891d2d127

#

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

@@ -896,17 +896,17 @@

        }

//        // 订单关联
//        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
//        for (WrkDetl wrkDetl : wrkDetls) {
//            if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
//                if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
//                    throw new CoolException("订单数据回滚失败");
//                }
//                // 生成新的出库作业
////                        stockOutRe(wrkMast, wrkDetls);
//            }
//        }
        // 订单关联
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
        for (WrkDetl wrkDetl : wrkDetls) {
            if (!Cools.isEmpty(wrkDetl.getOrderNo())) {
                if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
                    throw new CoolException("订单数据回滚失败");
                }
                // 生成新的出库作业
//                        stockOutRe(wrkMast, wrkDetls);
            }
        }

        // 取消操作人员记录
        wrkMast.setManuType("手动取消");

 src/main/java/com/zy/common/web/WcsController.java

@@ -256,7 +256,8 @@
            integer = rowLastnoService.selectNextWhsType();
            BasCrnp crn_no = basCrnpService.selectOne(new EntityWrapper<BasCrnp>()
                    .eq("crn_no", integer));
            if (crn_no.getInEnable().equals("Y") && crn_no.getCrnSts().equals("3")){
            if (crn_no.getInEnable().equals("Y")
                    && crn_no.getCrnSts() == 3){
                break;
            }
        }

 src/main/resources/mapper/OrderDetlMapper.xml

@@ -154,7 +154,7 @@

    <update id="decrease">
        update man_order_detl
        set work_qty = work_qty - #{qty}
        set qty = qty - #{qty}
        where 1=1
        and order_no = #{orderNo}
        and matnr = #{matnr}

 src/main/webapp/static/js/order/order.js

@@ -182,6 +182,7 @@
                        layer.tips('请添加单据明细', '#matAddBtnComment', {tips: [1, '#ff4c4c']});
                        return false;
                    }
                    console.log(data)
                    let nList = admin.util.deepClone(xxDataList);
                    for (let xi = 0; xi < nList.length; xi++) {
                        if (nList[xi].anfme <= 0){