#

zc

2024-11-01 a4699af3282d7abe89f9a9be40e8742fdd3b12b3

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

@@ -2,11 +2,12 @@

import com.alibaba.fastjson.JSON;
import com.core.annotations.AppAuth;
import com.core.common.*;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.param.*;
import com.zy.asrs.service.OpenService;
import com.zy.common.model.DetlDto;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,8 +15,8 @@

import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;

/**
 * Created by vincent on 2022/4/8
@@ -32,6 +33,55 @@

    @Autowired
    private OpenService openService;

    @Deprecated
    @PostMapping("/grouping")
    @AppAuth(memo = "AGV组托调用")
    public synchronized R grouping(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) AgvGroupingParam param,
                                      HttpServletRequest request){
        auth(appkey, param, request);
        if (Cools.isEmpty(param.getOrderNo())) {
            param.setOrderNo(param.getBillNo());
        }
        List<AgvGroupingParam.CombMat> combMats = param.getCombMats();
        combMats.forEach(elem -> {
            if (Cools.isEmpty(elem.getBatch())) {
                elem.setBatch(elem.getItemBatch());
            }
        });

        return openService.grouping(param);
    }

    @PostMapping("/barcodeVerificatio")
    @AppAuth(memo = "AGV调用校验条码")
    public synchronized R barcodeVerificatio(@RequestHeader(required = false) String appkey,
                                   @RequestBody(required = false) Map<String,String> param,
                                   HttpServletRequest request){
        auth(appkey, param, request);

        // 托盘条码
        String barcode = param.get("barcode");
        if (Cools.isEmpty(barcode)) {
           return R.parse("条码不能为空");
        }

        return openService.barcodeVerificatio(barcode);
    }

    @PostMapping("/outbound")
    @AppAuth(memo = "MES调用出库")
    public synchronized R outbound(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) OutBoundParam param,
                                      HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param.getEndLocation(),param.getBarcode(),param.getOrderNo())) {
            return R.parse(BaseRes.PARAM);
        }

        return openService.outbound(param);
    }

    @PostMapping("/order/matSync/default/v1")
    @AppAuth(memo = "商品信息同步接口")
@@ -83,7 +133,7 @@
        if (Cools.isEmpty(param.getOrderDetails())) {
            return R.error("单据明细[orderDetails]不能为空");
        }
        openService.pakinOrderCreate(param);
        //openService.pakinOrderCreate(param);
        return R.ok();
    }

@@ -165,43 +215,43 @@
        }
    }

    public static void main(String[] args) {
        // 1
        System.out.println("======================================");
        OpenOrderPakinParam param = new OpenOrderPakinParam();
        param.setOrderNo(String.valueOf(new SnowflakeIdWorker().nextId()));
        param.setOrderType("打包上线单");
        param.setOrderTime(DateUtils.convert(new Date()));
        List<DetlDto> orderDetails = new ArrayList<>();
        param.setOrderDetails(orderDetails);
        for (int i = 0; i < 3; i++) {
            DetlDto detlDto = new DetlDto();
            switch (i) {
                case 0:
                    detlDto.setMatnr("MDH020030530");
                    detlDto.setBatch("500");
                    detlDto.setAnfme(18.0);
                    break;
                case 1:
                    detlDto.setMatnr("MDH020016416");
                    detlDto.setBatch("500");
                    detlDto.setAnfme(32.0);
                    break;
                case 2:
                    detlDto.setMatnr("LSH90152025");
                    detlDto.setAnfme(50.0);
                    break;
                default:
                    break;
            }
            orderDetails.add(detlDto);
        }
        System.out.println(JSON.toJSONString(param));
        // 2
        System.out.println("======================================");
        OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
        param1.setOrderNo("963001846497017856");
        System.out.println(JSON.toJSONString(param1));
    }
//    public static void main(String[] args) {
//        // 1
//        System.out.println("======================================");
//        OpenOrderPakinParam param = new OpenOrderPakinParam();
//        param.setOrderNo(String.valueOf(new SnowflakeIdWorker().nextId()));
//        param.setOrderType("打包上线单");
//        param.setOrderTime(DateUtils.convert(new Date()));
//        List<DetlDto> orderDetails = new ArrayList<>();
//        param.setOrderDetails(orderDetails);
//        for (int i = 0; i < 3; i++) {
//            DetlDto detlDto = new DetlDto(locDto);
//            switch (i) {
//                case 0:
//                    detlDto.setMatnr("MDH020030530");
//                    detlDto.setBatch("500");
//                    detlDto.setAnfme(18.0);
//                    break;
//                case 1:
//                    detlDto.setMatnr("MDH020016416");
//                    detlDto.setBatch("500");
//                    detlDto.setAnfme(32.0);
//                    break;
//                case 2:
//                    detlDto.setMatnr("LSH90152025");
//                    detlDto.setAnfme(50.0);
//                    break;
//                default:
//                    break;
//            }
//            orderDetails.add(detlDto);
//        }
//        System.out.println(JSON.toJSONString(param));
//        // 2
//        System.out.println("======================================");
//        OpenOrderCompleteParam param1 = new OpenOrderCompleteParam();
//        param1.setOrderNo("963001846497017856");
//        System.out.println(JSON.toJSONString(param1));
//    }

}