no message

skyouc

2 天以前 7195aaf32896dc48b686b1a145e67a9afe9205dd

no message

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

@@ -36,6 +36,15 @@
        }
        WrkMastLog mastLog = new WrkMastLog();
        BeanUtils.copyProperties(mast, mastLog);
        if (mastLog.getIoType() == 101) {
            mastLog.setWrkSts(15);
            mastLog.setSourceLocNo(mast.getSourceLocNo());
            mastLog.setStaNo(Integer.parseInt(mast.getStaNo()));
        } else {
            mastLog.setWrkSts(5);
            mastLog.setSourceStaNo(Integer.parseInt(mast.getSourceStaNo()));
            mastLog.setLocNo(mast.getLocNo());
        }
        mastLog.setLogId(mast.getId());

        if (!wrkMastLogService.insert(mastLog)) {

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

@@ -396,13 +396,14 @@

            List<OrderItemsParam> reportOrderParams = new ArrayList<>();
            orderDetls.forEach(detl -> {
                Mat material = matService.selectByMatnr(detl.getMatnr());
                Mat material = matService.selectOne(new EntityWrapper<Mat>().eq("matnr",  detl.getMatnr())
                        .eq("supp_code", detl.getSuppCode()));
                if (Objects.isNull(material)) {
                    throw new CoolException(material.getMatnr() + "物料不存在");
                }
                TaskDetlLog taskDetlLog = taskDetlLogService.selectOne(new EntityWrapper<TaskDetlLog>()
                        .eq("matnr", detl.getMatnr())
                        .eq("supp_code", detl.getStandby1())
                        .eq("supp_code", detl.getSuppCode())
                        .eq("order_no", detl.getOrderNo()));
                if (Objects.isNull(taskDetlLog) || Objects.isNull(taskDetlLog.getAreaType())) {
                    orderParam.setTarget_location("2");
@@ -414,13 +415,9 @@
                        .eq("matnr", detl.getMatnr())
                        .eq("supp_code", detl.getStandby1())
                        .eq("order_no", detl.getOrderNo()));
                detlLog.forEach(item -> {
                if (Objects.isNull(detlLog) || detlLog.isEmpty()) {
                    OrderItemsParam itemParam = new OrderItemsParam();
                    if (Objects.isNull(item)) {
                        itemParam.setLocation_no("LX99999999");
                    } else {
                        itemParam.setLocation_no(item.getZpallet());
                    }
                    itemParam.setLocation_no("LX99999999");
                    itemParam
                            // 上报时，默认产品类型是null
                            .setPro_type(material.getProType())
@@ -431,10 +428,28 @@
//                        // 上报时，默认来源位置是null
//                              .setLocation_no(detlLog.getZpallet())
                            // 上报时，默认上报数量是订单数量
                            .setPick_qty(item.getAnfme().intValue());
                            .setPick_qty(0);
//                            .setPick_qty(Objects.isNull(detl.getQty()) ? 0 : detl.getQty().intValue());
                    reportOrderParams.add(itemParam);
                });
                } else {
                    detlLog.forEach(item -> {
                        OrderItemsParam itemParam = new OrderItemsParam();
                        itemParam.setLocation_no(item.getZpallet());
                        itemParam
                                // 上报时，默认产品类型是null
                                .setPro_type(material.getProType())
                                // 上报时，默认产品编码
                                .setPro_komcode(detl.getMatnr())
                                // 上报时，默认产品id是供应商编码
                                .setPro_id(detl.getSuppCode())
//                        // 上报时，默认来源位置是null
//                              .setLocation_no(detlLog.getZpallet())
                                // 上报时，默认上报数量是订单数量
                                .setPick_qty(item.getAnfme().intValue());
//                            .setPick_qty(Objects.isNull(detl.getQty()) ? 0 : detl.getQty().intValue());
                        reportOrderParams.add(itemParam);
                    });
                }
            });

            //目标库区

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

@@ -66,7 +66,6 @@
                        if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 8 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 104) {
                            OrderInAndOutUtil.checkComplete(Boolean.TRUE, wrkDetl.getOrderNo());
                        } else {

                            OrderInAndOutUtil.checkComplete(Boolean.FALSE, wrkDetl.getOrderNo());

                            OrderPakin orderPakin = orderPakinService.selectOne(new EntityWrapper<OrderPakin>()

 src/main/java/com/zy/common/service/CommonService.java

@@ -216,7 +216,7 @@
                .le("row1", rowLastno.geteRow())
                .eq("loc_type1", locTypeDto.getLocType1())
                .eq("loc_sts", "O")
                .orderAsc(Arrays.asList( "row1", "lev1", "bay1"));
                .orderAsc(Arrays.asList("lev1", "row1", "bay1"));

        if (locTypeDto.getLocType1() != 2) {
            wrapper.eq("crn_no", crnNo);