#

whycq

2024-06-11 f0c73d72fe7f939be2d3fdf5fc90889971a67fe5

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

@@ -35,106 +35,6 @@
    @Autowired
    private OpenService openService;



    /****************************************************************************/
    /********************************* 打包上线 **********************************/
    /****************************************************************************/


    @PostMapping("/order/pakin/new/package/v1")
    @AppAuth(memo = "打包上线接口")
    public synchronized R pakinOrderPackage(@RequestHeader(required = false) String appkey,
                                            @RequestBody(required = false) PackParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        openService.packageUp(param);
        return R.ok();
    }



    /**
     * 添加入库单
     */
    @PostMapping("/order/pakin/new/default/v1")
    public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
                                           @RequestBody OpenOrderPakinParam param,
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getOrderNo())) {
            return R.error("单据编号[orderNo]不能为空");
        }
        if (Cools.isEmpty(param.getOrderType())) {
            return R.error("单据类型[orderType]不能为空");
        }
        if (Cools.isEmpty(param.getOrderDetails())) {
            return R.error("单据明细[orderDetails]不能为空");
        }
        openService.pakinOrderCreate(param);
        return R.ok();
    }

    /**
     * 入库单回写
     */
    @PostMapping("/order/pakin/complete/default/v1")
    public synchronized R orderPakinComplete(@RequestHeader(required = false) String appkey,
                                             @RequestBody(required = false) OpenOrderCompleteParam param,
                                             HttpServletRequest request) {
        auth(appkey, param, request);
        return R.ok().add(openService.pakinOrderComplete(param));
    }

    /**
     * 添加出库单
     */
    @PostMapping("/order/pakout/new/default/v1")
    @AppAuth(memo = "添加订单出库")
    public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody OpenOrderPakoutParam param,
                                            HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getLgort())) {
            return R.error("单据编号[lgort]不能为空");
        }
        if (!param.getLgort().equals("5006")) {
            return R.ok();
        }
        if (Cools.isEmpty(param.getOrderNo())) {
            return R.error("单据编号[orderNo]不能为空");
        }
        if (Cools.isEmpty(param.getOrderType())) {
            return R.error("单据类型[orderType]不能为空");
        }
        if (Cools.isEmpty(param.getOrderDetails())) {
            return R.error("单据明细[orderDetails]不能为空");
        }
        openService.pakoutOrderCreate(param);
        return R.ok();
    }

    /**
     * 出库单回写
     */
    @PostMapping("/order/pakout/complete/default/v1")
    public synchronized R orderPakoutComplete(@RequestHeader(required = false) String appkey,
                                              @RequestBody(required = false) OpenOrderCompleteParam param,
                                              HttpServletRequest request) {
        auth(appkey, param, request);
        return R.ok().add(openService.pakoutOrderComplete(param));
    }


    /**
     * 库存统计
     */
@@ -163,45 +63,7 @@

    }

    /**
     * 入库通知档生成
     */
    @PostMapping("/comb/v1")
    public synchronized R combMES(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) CombParam param,
                                      HttpServletRequest request){
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        openService.combMes(param);
        return R.ok("组托成功");
    }

    /**
     * 入库记录获取
     */
    @PostMapping("/inlog/v1")
    public synchronized R inlogERP(@RequestHeader(required = false) String appkey,
                                  HttpServletRequest request){
        auth(appkey,null, request);
        if (Cools.isEmpty()) {
            return R.parse(BaseRes.PARAM);
        }
        return R.ok().add(openService.inlogERP());
    }
    /**
     * 出库记录获取
     */
    @PostMapping("/outlog/v1")
    public synchronized R outlogERP(@RequestHeader(required = false) String appkey,
                                   HttpServletRequest request){
        auth(appkey,null, request);
        if (Cools.isEmpty()) {
            return R.parse(BaseRes.PARAM);
        }
        return R.ok().add(openService.outlogERP());
    }


    private void auth(String appkey, Object obj, HttpServletRequest request) {
@@ -218,64 +80,23 @@
        }
    }

    @PostMapping("/order/matSync/default/v1")
    public synchronized R syncMatInfoU8(@RequestHeader(required = false) String appkey,
                                         @RequestBody(required = false) Map<String, Object> param,
                                         HttpServletRequest request){

    @PostMapping("/order/pak/default/v1")
    @AppAuth(memo = "生成退货补货单据")
    public synchronized R orderAccept(@RequestHeader(required = false) String appkey,
                                     @RequestBody(required = true) OrderSyncParam param,
                                     HttpServletRequest request){
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }

        int msgU = 0;
        int msgT = 0;
        int msgF = 0;
        StringBuilder msg= new StringBuilder("原因：");
        String docName = param.get操作单据();
        boolean pakin = param.getPakin() == 1 ? true : false;

        List<MatInfoParam> matDetails = (List<MatInfoParam>) param.get("matDetails");
        openService.syncOrder(param,pakin,docName);

        for (Object matDetail : matDetails){
            MatInfoParam matInfoParam = JSONObject.parseObject(JSON.toJSONString(matDetail),MatInfoParam.class);
            if (Cools.isEmpty(matDetails)) {
                msgF++;
                continue;
            }
            openService.syncMat(matInfoParam);
            if(matInfoParam.isUpdate()){
                msgU++;
            }else if(matInfoParam.isInsert()){
                msgT++;
            } else if(matInfoParam.isError()){
                msgF++;
                msg.append(matInfoParam.getCinvcode()).append(":").append(matInfoParam.getMemo()).append(";");
            }
        }
        String message = "";
        boolean success = false;
        if(msgT != 0){
            message += "成功接收物料："+msgT+"个";
            success = true;
        }
        if(msgU != 0){
            message += "成功修改物料："+msgU+"个";
            success = true;
        }
        if(msgF != 0){
            message += "接收物料失败："+msgF+"个;"+msg;
        }
        if(success){
            return R.ok(message);
        }else {
            return R.error(message);
        }

//        if (MsgF==0){
//            return R.ok("成功接收物料："+MsgT+"个");
//        }else if (MsgT==0){
//            return R.error("接收物料失败："+MsgF+"个;"+Msg);
//        }else {
//            return R.ok("成功接收物料："+MsgT+"个;"+"接收物料失败："+MsgF+"个;"+Msg);
//        }
        return R.ok("单据接受成功");

    }