pjb
2025-06-25 0066150978efa004da69e580390a021ebef1824e
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);
    }
}