兼容四期

zhangc

2025-02-13 b25fc15afed603c0c874e77d37bf93f08d5398c9

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

@@ -1,15 +1,19 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.AppAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.core.exception.CoolException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.zy.asrs.entity.ApiLog;
import com.zy.asrs.entity.param.CheckParam;
import com.zy.asrs.entity.param.MatSyncParam;
import com.zy.asrs.entity.param.OrderProdSyncParam;
import com.zy.asrs.entity.param.OrderSyncParam;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OpenService;
import com.zy.common.utils.Synchro;
import com.zy.common.web.BaseController;
@@ -18,7 +22,9 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@@ -38,6 +44,11 @@

    @Autowired
    private OpenService openService;


    @Autowired
    private ApiLogService apiLogService;


    /**
     * 库存统计
@@ -69,7 +80,7 @@


    private void auth(String appkey, Object obj, HttpServletRequest request) {
        log.info("{}接口被访问；appkey:{}；请求数据：{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
        //log.info("{}接口被访问；appkey:{}；请求数据：{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
        request.setAttribute("cache", obj);
        if (!auth) {
            return;
@@ -83,23 +94,22 @@
    }


    @PostMapping("/order/pak/default/v1")
    @AppAuth(memo = "生成退货补货单据")
    public synchronized R orderAccept(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = true) OrderSyncParam param,
                                      HttpServletRequest request) {
        log.info("生成退货补货单据,{}", JSON.toJSONString(param));
    /*
  盘点接口
   */
    @PostMapping("/check/default/v1")
    @AppAuth(memo = "库存盘点")
    public synchronized R checkLoc(@RequestHeader(required = false) String appkey,
                                   @RequestBody CheckParam param,
                                   HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }

        String docName = param.get操作单据();
        boolean pakin = param.getPakin() == 1 ? true : false;
        openService.checkAndAdjustLocDetl(param);

        openService.syncOrder(param, pakin, docName);

        return R.ok("单据接受成功");
        return R.ok("库存调整成功");

    }

@@ -108,7 +118,7 @@
    public synchronized R orderPakin(@RequestHeader(required = false) String appkey,
                                     @RequestBody Map<String, Object> map,
                                     HttpServletRequest request) {
        log.info("生成入库单据,{}", JSON.toJSONString(map));
        //log.info("生成入库单据,{}", JSON.toJSONString(map));
        OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
@@ -180,38 +190,12 @@

    }

    /*
    盘点接口
     */
    @PostMapping("/check/default/v1")
    @AppAuth(memo = "库存盘点")
    public synchronized R checkLoc(@RequestHeader(required = false) String appkey,
                                   @RequestBody CheckParam param,
                                   HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }

        openService.checkAndAdjustLocDetl(param);

        return R.ok("库存调整成功");

    }

    public static void main(String[] args) {
        String jsonString = "\n" +
                "{\"操作系统号\": \"004\",\"操作单据\": \"Purchase\",\"操作类型\": \"\",\"cPOID\":\"PO10047790\",\"cVenCode\":\"2HLSL\",\"cPersonCode\":\"\",\"cSCCode\":\"\",\"cexch_name\":\"CNY\",\"nflat\":\"1.0\",\"ddate\":\"2024-10-31 00:00:00.0\",\"cMemo\":\"同2407G027\",\"states\":\"0\", \"children\": [{\"ivouchrowno\": \"1\",\"cInvCode\": \"102010400264\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1220.0000000000\",\"iTaxPrice\": \"3.250000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-1\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260272\"},{\"ivouchrowno\": \"2\",\"cInvCode\": \"102010400265\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1220.0000000000\",\"iTaxPrice\": \"3.250000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-1\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260273\"},{\"ivouchrowno\": \"3\",\"cInvCode\": \"102020100561\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1200.0000000000\",\"iTaxPrice\": \"0.150000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-1\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260274\"},{\"ivouchrowno\": \"4\",\"cInvCode\": \"102020100562\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1200.0000000000\",\"iTaxPrice\": \"0.150000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-1\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260275\"},{\"ivouchrowno\": \"5\",\"cInvCode\": \"102010101502\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1220.0000000000\",\"iTaxPrice\": \"3.000000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-2\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260276\"},{\"ivouchrowno\": \"6\",\"cInvCode\": \"102010101503\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1220.0000000000\",\"iTaxPrice\": \"3.000000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-2\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260277\"},{\"ivouchrowno\": \"7\",\"cInvCode\": \"102020100561\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1200.0000000000\",\"iTaxPrice\": \"0.150000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-2\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260278\"},{\"ivouchrowno\": \"8\",\"cInvCode\": \"102020100562\",\"dArriveDate\": \"2024-11-20 00:00:00\",\"iQuantity\": \"1200.0000000000\",\"iTaxPrice\": \"0.150000\",\"iPerTaxRate\": \"13.000000\",\"cbMemo\": \"\",\"bomid\": \"\",\"iNum\": \"\",\"cDefine22\": \"2501G023-2\",\"cSource\": \"\",\"Rstates\": \"0\",\"iorderdid\": \"\",\"cFree1\": \"\",\"id\": \"1000260279\"}]}";
        OrderProdSyncParam param = new OrderProdSyncParam();
        OrderProdSyncParam orderProdSyncParam = JSON.parseObject(jsonString, OrderProdSyncParam.class);
        System.out.println(orderProdSyncParam.getCPOID());
    }

    @PostMapping("/order/pakout/default/v1")
    @AppAuth(memo = "同步工单单据")
    public synchronized R orderPakout(@RequestHeader(required = false) String appkey,
                                      @RequestBody Map<String, Object> map) {
        log.info("同步工单单据,{}", JSON.toJSONString(map));
        //log.info("同步工单单据,{}", JSON.toJSONString(map));
        OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
@@ -274,27 +258,52 @@
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
                break;
        }
        return R.ok("单据接受成功");

//        if (!Cools.eq("生产", param.getCVouchtype())) {
//            //String docName = param.getIQuantity() > 0 ? "银座委外入库单" : "银座委外入库退货单";
//            boolean pakin = param.getIQuantity() > 0 ? true : false;
//            mappingPakInOrderParam(param, pakin, param.get操作单据());
//
//            if (!Cools.isEmpty(param.getChildren())) {
//                //String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "银座委外材料出库单" : "银座委外材料退料单";
//                boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
//                mappingPakOutOrderParam(param, pakin1, param.getChildren().get(0).get操作单据());
//            }
//
//        } else if (!Cools.isEmpty(param.getChildren())) {
//            //String docName1 = param.getChildren().get(0).getIQuantity() > 0 ? "银座生产材料出库单" : "银座生产材料退料单";
//            boolean pakin1 = param.getChildren().get(0).getIQuantity() > 0 ? true : false;
//            mappingPakOutOrderParam(param, pakin1, param.get操作单据());
//        }
    }

    @PostMapping("/order/pak/default/v1")
    @AppAuth(memo = "生成入库单据")
    public synchronized R orderPakin2(@RequestHeader(required = false) String appkey,
                                      @RequestBody Map<String, Object> map,
                                      HttpServletRequest request) {
        //log.info("生成入库单据,{}", JSON.toJSONString(map));
        OrderProdSyncParam param = JSON.parseObject(JSON.toJSONString(map), OrderProdSyncParam.class);
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        if (Cools.isEmpty(param.getOrderNo()) && Cools.isEmpty(param.getCPOID())) {
            return R.parse(BaseRes.PARAM);
        }
        String docName = param.getOrderType();
        if (Cools.isEmpty(docName)) {
            return R.parse(BaseRes.PARAM);
        }
        switch (docName) {
            case "银座生产领料申请单":
                mappingPakOutOrderParam(param, false, "银座生产领料申请单");
                break;
            case "银座生产退料申请单":
                mappingPakOutOrderParam(param, true, "银座生产退料申请单");
                break;
            case "银座生产补料申请单":
                mappingPakOutOrderParam(param, false, "银座生产补料申请单");
                break;
            case "银座生产入库申请单":
                mappingPakOutOrderParam(param, true, "银座生产入库申请单");
                break;
            default:
                log.info("未知的单据类型:{}", param);
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, docName);
                // return R.error("单据接受失败:未知的单据类型");
                break;
        }

        return R.ok("单据接受成功");

    }


    @PostMapping("/order/delete/default/v1")
    @AppAuth(memo = "单据删除审核")
@@ -467,4 +476,25 @@

        //return orderSyncParam;
    }

//    @PostMapping("/order/add")
//    public R re(@RequestHeader(required = false) String appkey,
//                HttpServletRequest request) throws IOException {
//        List<ApiLog> apiLogs = apiLogService.selectList(new EntityWrapper<ApiLog>().eq("url", "/phyzwms/open/asrs/order/pakin/default/v1").eq("response", "{\"msg\":\"服务器错误\",\"code\":500}").ge("create_time", "2025-01-06 00:00:00"));
//        for (ApiLog apiLog : apiLogs) {
//            Map<String, Object> param = new HashMap<>();
//            ObjectMapper mapper = new ObjectMapper();
//            if (!Cools.isEmpty(apiLog.getRequest())) {
//                param = mapper.readValue(apiLog.getRequest(), Map.class);
//                try {
//                    orderPakin(appkey, param, request);
//                } catch (Exception e) {
//
//                }
//            }
//        }
//        return R.ok();
//
//    }

}