*

lsh

13 小时以前 8d702fa2c62b3617f71c5e91293e338d1ccd1549

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

@@ -13,6 +13,7 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -311,27 +312,14 @@
     * 添加出库单、正常退库至二楼包装
     */
    @PostMapping("/order/normalTransferToTheSecond-floorPackagingArea/v1")
    @AppAuth(memo = "正常退库至二楼包装")
    @AppAuth(memo = "拆包装检出库")
    public synchronized R packagingAreaOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody QualityInspectionParam param,
                                            @RequestBody @Valid OrderCargoBookingNoteParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        //判断param参数
        if (Cools.isEmpty(param.getBoxNo())){
            throw new CoolException("参数：箱号 boxNo为空");
        }
        //判断param参数
        if (Cools.isEmpty(param.getModel())){
            throw new CoolException("参数：卷号 Model为空");
        }
        //判断param参数
        if (Cools.isEmpty(param.getMemo())){
            throw new CoolException("参数：备注 Memo为空");
        }

        return openService.packagingAreaOrderCreate(param);
    }

@@ -343,23 +331,17 @@
    @PostMapping("/order/cargo/booking/note/v1")
    @AppAuth(memo = "计划组货单")
    public synchronized R cargoBookingNote(@RequestHeader(required = false) String appkey,
                                                   @RequestBody OrderCargoBookingNoteParam param,
                                                   @RequestBody @Valid OrderCargoBookingNoteParam param,
                                                   HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        //判断param参数
        if (Cools.isEmpty(param.getGroupGoodsNo())){
            throw new CoolException("参数：组货单号 groupGoodsNo为空");
            return new R(401,"组货单号为空！");
        }
        //判断param参数
        if (Cools.isEmpty(param.getModelList()) || param.getBoxNoList().isEmpty()){
            throw new CoolException("参数：卷号 modelList为空");
        }
        //判断param参数
        if (Cools.isEmpty(param.getBoxNoList()) || param.getModelList().isEmpty()){
            throw new CoolException("参数：箱号集合 boxNoList为空");
        if (Cools.isEmpty(param.getCstmrName())){
            return new R(401,"客户名称为空！");
        }

        return openService.cargoBookingNote(param);