pjb
2025-06-25 0066150978efa004da69e580390a021ebef1824e
Merge branch 'ycds-wms-dev' of http://47.97.1.152:5880/r/zy-asrs-master into ycds-wms-dev
4个文件已修改
29 ■■■■■ 已修改文件
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/BatchMergeOrdersParam.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
@@ -13,6 +13,7 @@
import com.zy.asrs.wms.asrs.entity.dto.OrderInfoDto;
import com.zy.asrs.wms.asrs.entity.dto.PickSheetDetlDto;
import com.zy.asrs.wms.asrs.entity.dto.ShippingOrderDetlDto;
import com.zy.asrs.wms.asrs.entity.enums.OrderType;
import com.zy.asrs.wms.asrs.entity.param.BatchMergeOrdersParam;
import com.zy.asrs.wms.asrs.entity.param.PakinOnShelvesParams;
import com.zy.asrs.wms.asrs.service.MobileService;
@@ -174,6 +175,12 @@
    }
    /**
     * @author Ryan
     * @date 2025/6/25
     * @description: 组托
     * @version 1.0
     */
    @PostMapping("/comb/auth")
    public  R combMats(@RequestBody BatchMergeOrdersParam ordersParam) {
        if (StringUtil.isNullOrEmpty(ordersParam.getOrderNo())) {
@@ -187,11 +194,13 @@
        }
        String str = ordersParam.getMergeNo().trim();
        // CUT库条码T开头,截取后10位
        // CTU库条码T开头,截取后10位
        if (str.charAt(0) == 'T') {
            ordersParam.setMergeNo(str.substring(str.length() - 10));
        }
        if (str.startsWith("PK")) {
            ordersParam.setInType(OrderType.PK_IN_ORDER.id);
        }
       boolean result = mobileService.batchMergeOrders(ordersParam);
        if (result) {
            return R.ok("组托成功!!");
@@ -295,7 +304,4 @@
        }
        return mobileService.confirmShippingDetl(params);
    }
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/param/BatchMergeOrdersParam.java
@@ -13,6 +13,8 @@
    private String orderNo;
    /**容器编码*/
    private String mergeNo;
    /**入库类型: 平库, CTU库*/
    private Long inType;
    /**需组托合并订单明细*/
    private List<OrderInfoDto> orderDetls;
}
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
@@ -117,8 +117,9 @@
            waitPakinService.comb(pakin);
        });
        // UTC入库单据(非平库入库单据)
        if (order.getOrderType() != OrderType.PK_IN_ORDER.id) {
        if (!ordersParam.getInType().equals(OrderType.PK_IN_ORDER.id)) {
            /*** 项目下发流程 * 1. PDA组拖通知档* 2. 生成任务档* 3. 通过定时任务下发至ESS** */
            //生成任务档
            GeneratePakInParam generatePakInParam = new GeneratePakInParam();
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderNoRuleServiceImpl.java
@@ -44,10 +44,10 @@
        StringBuffer buffer = new StringBuffer();
        buffer.append(orderNoRule.getOrderConst());//订单常量
        String pattern = "yyyyMMddHHmmss";
        if (orderNoRule.getTimeRule() == 0) {
            pattern = "yyyyMMdd";
        }
        String pattern = "yyMMddHHmmss";
//        if (orderNoRule.getTimeRule() == 0) {
//            pattern = "yyyyMMdd";
//        }
        SimpleDateFormat format = new SimpleDateFormat(pattern);
        buffer.append(format.format(new Date()));//订单时间