#

ytfl

4 天以前 4188991b66415e591b636dd304340b9d4674dcdf

#

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

@@ -547,11 +547,12 @@
            return R.error("订单已被执行，无法同步");
        }

        OrderPakout orderPakout = orderPakoutService.selectByNo(orderNo);
        if(orderPakout == null) {
        List<OrderPakout> orderPakoutList = orderPakoutService.selectList(new EntityWrapper<OrderPakout>()
                .like("order_no", orderNo));
        if(orderPakoutList.isEmpty()) {
            return R.error("出库订单不存在");
        }

        OrderPakout orderPakout = orderPakoutList.get(0);
        if (orderPakout.getDocType$().equals("销售发货")) {
            NccSaleXsfhmxWms nccSaleXsfhmxWms = new NccSaleXsfhmxWms();
            nccSaleXsfhmxWms.setWmsFlag(0);

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

@@ -168,6 +168,8 @@
                        locDto.setBoxType2(orderDetl.getBoxType2());
                        locDto.setBoxType3(orderDetl.getBoxType3());
                        locDto.setUnit(orderDetl.getUnit());
                        locDto.setInitialAnfme(locDetl.getAnfme());//原托盘数量
                        locDto.setInitialWeight(locDetl.getWeight());//原托盘辅数量

                        //计算辅单位
                        Double weight = MatUtils.calcWeight(locDto.getMatnr(), locDto.getAnfme());

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

@@ -57,7 +57,7 @@
        if (locMast == null) {
            return false;
        }
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),1L) > 1;
        return this.baseMapper.selectEmptyLocCount(locMast.getLocType1(), locMast.getCrnNo(),1L) > 10;
    }

    @Override

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

@@ -236,6 +236,7 @@
            }
        } catch (Exception e) {
            e.printStackTrace();
            process1 = e.getMessage();
        } finally {
            reportApiLog(null, process1, process1, response1, "TKRK", nyncIp, saveRefDelivery, success1);
        }
@@ -255,6 +256,7 @@
            }
        } catch (Exception e) {
            e.printStackTrace();
            process2 = e.getMessage();
        } finally {
            reportApiLog(null, process2, process2, response2, "DBRK", nyncIp, dbdd, success2);
        }
@@ -409,7 +411,7 @@

        Double weight = MatUtils.calcWeight(matnr, anfme);
        iaIjBillB.setBid(nccSaleDbddWms.getCbill_bid());
        iaIjBillB.setNassistnum(weight);
        iaIjBillB.setNassistnum(weight * -1);
        iaIjBillB.setNnum(anfme * -1);
        iaIjBillB.setVbatchcode(batch);
        iaIjBillB.setClocationid("");
@@ -417,7 +419,7 @@

        bids.add(iaIjBillB);

        data.put("hid", nccSaleDbddWms.getCbill_bid());
        data.put("hid", nccSaleDbddWms.getCbillid());
        data.put("bids", bids);
        return data;
    }

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

@@ -340,17 +340,12 @@
            // 获取路径
            List<StaDesc> staDescs = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
            StaDesc staDesc = staDescs.get(0);
            Integer crnStn = staDesc.getCrnStn();
            if (locMast.getCrnNo() == 1) {
                int finalCrnStn = 1016;
                if (locMast.getRow1() <= 3) {
                    finalCrnStn = 1013;
                }

                for (StaDesc desc : staDescs) {
                    if (desc.getCrnStn() == finalCrnStn) {
                        staDesc = desc;
                        break;
                    }
                    crnStn = 1013;
                }else {
                    crnStn = 1016;
                }
            }

@@ -378,7 +373,7 @@
            wrkMast.setIoType(ioType); // 入出库状态
            wrkMast.setIoPri(13D); // 优先级：13
            wrkMast.setCrnNo(locMast.getCrnNo());
            wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 源站
            wrkMast.setSourceStaNo(crnStn); // 源站
            wrkMast.setStaNo(staDesc.getStnNo()); // 目标站
            wrkMast.setSourceLocNo(dto.getLocNo()); // 源库位
            wrkMast.setFullPlt("Y"); // 满板：Y

 src/main/java/com/zy/common/model/LocDto.java

@@ -32,6 +32,12 @@

    private Double anfme;

    /*原托盘数量*/
    private Double initialAnfme;

    /*原托盘辅数量*/
    private Double initialWeight;

    /**
     * 是否冻结  "是否冻结,0.未冻结，1.已冻结"
     */

 src/main/webapp/static/js/orderPakout/out.js

@@ -224,6 +224,8 @@
                                    {field: 'orderNo', title: '单据编号', merge: true, align: 'center'},
                                    {field: 'title', title: '商品', merge: true, align: 'center', width: 350},
                                    {field: 'batch', title: '批次', align: 'center'},
                                    {field: 'initialWeight', title: '原托盘辅数量', align: 'center', width: 90, style: 'font-weight: bold'},
                                    {field: 'initialAnfme', title: '原托盘数量', align: 'center', width: 90, style: 'font-weight: bold'},
                                    {field: 'anfme', title: '主数量', align: 'center', width: 90, style: 'font-weight: bold'},
                                    {field: 'weight', title: '辅数量', align: 'center', width: 90, style: 'font-weight: bold'},
                                    {field: 'unit', align: 'center',title: '单位'},