yangyang
2025-06-29 5cf0fe34b6ef60407e7e8802d3f756bed9d9b7ac
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;
@@ -151,7 +152,7 @@
            return R.parse(CodeRes.USER_10003);
        }
        String system = null;//登陆系统
        if (wms) {
        if (Objects.isNull(wms) || wms) {
            system = String.valueOf(LoginSystemType.WMS);
        }else {
            system = String.valueOf(LoginSystemType.WCS);
@@ -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,15 @@
        }
        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);
        } else {
            ordersParam.setInType(OrderType.UTC_OUT_ORDER.id);
        }
       boolean result = mobileService.batchMergeOrders(ordersParam);
        if (result) {
            return R.ok("组托成功!!");
@@ -284,6 +295,31 @@
        return mobileService.selectShippingDetl(params);
    }
    /**
     * @author Ryan
     * @date 2025/6/28
     * @description: 获取推荐库位
     * @version 1.0
     */
    @PostMapping("/recommend/locs")
    public R getRecommend() {
        return  mobileService.getRecommendLocs();
    }
    /**
     * @author Ryan
     * @date 2025/6/28
     * @description: 查询物料信息
     * @version 1.0
     */
    @GetMapping("/mats/search/{matnr}")
    public R getMats(@PathVariable String matnr) {
        return mobileService.getMatsByCode(matnr);
    }
    /**
     * 确认发货单明细
     * @return
@@ -295,7 +331,4 @@
        }
        return mobileService.confirmShippingDetl(params);
    }
}