自动化立体仓库 - WMS系统
zhang
3 天以前 63676447b730800bc7ba3df060bf867713db98f4
关闭与erp的对接
4个文件已修改
1120 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/OpenController.java 1078 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OrderController.java 30 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/order/order.html 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,543 +1,543 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSON;
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.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;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * Created by vincent on 2022/4/8
 */
@Slf4j
@RestController
@RequestMapping("open/asrs")
public class OpenController extends BaseController {
    private static final boolean auth = true;
    public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
        add("ea1f0459efc02a79f046f982767939ae");
    }};
    @Autowired
    private OpenService openService;
    @Autowired
    private ApiLogService apiLogService;
    /**
     * 库存统计
     */
    @RequestMapping("/stock/default/v1")
    public R queryStock(@RequestHeader(required = false) String appkey,
                        HttpServletRequest request) {
        auth(appkey, null, request);
        return R.ok().add(openService.queryStock());
    }
    /**
     * 商品信息同步接口
     */
    @PostMapping("/mat/v1")
    @AppAuth(memo = "物料同步接口")
    public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey,
                                         @RequestBody(required = false) MatSyncParam param,
                                         HttpServletRequest request) {
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        openService.syncMat(param);
        return R.ok("更新成功");
    }
    private void auth(String appkey, Object obj, HttpServletRequest request) {
        //log.info("{}接口被访问;appkey:{};请求数据:{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
        request.setAttribute("cache", obj);
        if (!auth) {
            return;
        }
        if (Cools.isEmpty(appkey)) {
            throw new CoolException("认证失败,请确认appkey无误!");
        }
        if (!APP_KEY_LIST.contains(appkey)) {
            throw new CoolException("认证失败,请确认appkey无误!");
        }
    }
    /*
  盘点接口
   */
    @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("库存调整成功");
    }
    @PostMapping("/order/pakin/default/v1")
    @AppAuth(memo = "生成入库单据")
    public synchronized R orderPakin(@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.get操作单据();
        if (Cools.isEmpty(docName)) {
            docName = param.getOrderType();
        }
        switch (docName) {
            case "Purchase":
                mappingPakOutOrderParam(param, true, "银座采购入库单");
                break;
            case "MO":
                mappingPakInOrderParam(param, true, "银座委外生产订单");
                mappingOrderParam(param, false, "银座未包装成品出库单");
                mappingOrderParamDB40(param, false, "半成品调拨单");
                //mappingOrderParam40(param, false, "半成品出库单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座委外材料出库单");
                }
                break;
            case "OM":
                mappingPakInOrderParam(param, true, "银座生产订单");
                mappingOrderParam(param, false, "银座委外未包装成品出库单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座生产材料出库单");
                }
                break;
            case "采购入库单退货":
                mappingPakOutOrderParam(param, false, "银座采购入库单退货");
                break;
            case "委外入库单退货":
                mappingPakOutOrderParam(param, false, "银座委外入库单退货");
                break;
            case "其他出库单":
                mappingPakOutOrderParam(param, false, "其他出库单");
                break;
            case "其他入库单":
                mappingPakOutOrderParam(param, true, "其他入库单");
                break;
            case "委外材料出库退料":
                mappingPakOutOrderParam(param, true, "银座委外材料出库退料");
                break;
            case "生产材料出库退料":
                mappingPakOutOrderParam(param, true, "银座生产材料出库退料");
                break;
            case "委外材料出库补料":
                mappingPakOutOrderParam(param, false, "银座委外材料出库补料");
                break;
            case "生产材料出库补料":
                mappingPakOutOrderParam(param, false, "银座生产材料出库补料");
                break;
            case "半成品入库单":
                mappingPakOutOrderParam(param, true, "半成品入库单");
                break;
            case "成品入库单":
                mappingPakOutOrderParam(param, true, "成品入库单");
                break;
            default:
                log.info("未知的单据类型:{}", param);
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
                break;
        }
        return R.ok("单据接受成功");
    }
    @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));
        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.get操作单据();
        switch (docName) {
            case "Purchase":
                mappingPakOutOrderParam(param, true, "银座采购入库单");
                break;
            case "MO":
                mappingPakInOrderParam(param, true, "银座生产订单");
                mappingOrderParam(param, false, "银座未包装成品出库单");
                mappingOrderParamDB40(param, false, "半成品调拨单");
                //mappingOrderParam40(param, false, "半成品出库单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座生产材料出库单");
                }
                break;
            case "OM":
                mappingPakInOrderParam(param, true, "银座委外生产订单");
                mappingOrderParam(param, false, "银座委外未包装成品出库单");
                if (!Cools.isEmpty(param.getChildren())) {
                    mappingOrderParamChild(param, false, "银座委外材料出库单");
                }
                break;
            case "采购入库单退货":
                mappingPakOutOrderParam(param, false, "银座采购入库单退货");
                break;
            case "委外入库单退货":
                mappingPakOutOrderParam(param, false, "银座委外入库单退货");
                break;
            case "其他出库单":
                mappingPakOutOrderParam(param, false, "其他出库单");
                break;
            case "其他入库单":
                mappingPakOutOrderParam(param, true, "其他入库单");
                break;
            case "委外材料出库退料":
                mappingPakOutOrderParam(param, true, "银座委外材料出库退料");
                break;
            case "生产材料出库退料":
                mappingPakOutOrderParam(param, true, "银座生产材料出库退料");
                break;
            case "委外材料出库补料":
                mappingPakOutOrderParam(param, false, "银座委外材料出库补料");
                break;
            case "生产材料出库补料":
                mappingPakOutOrderParam(param, false, "银座生产材料出库补料");
                break;
            case "半成品入库单":
                mappingPakOutOrderParam(param, true, "半成品入库单");
                break;
            case "成品入库单":
                mappingPakOutOrderParam(param, true, "成品入库单");
                break;
            default:
                log.info("未知的单据类型:{}", param);
                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
                break;
        }
        return R.ok("单据接受成功");
    }
    @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 = "单据删除审核")
    public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
                                      @RequestBody(required = false) Map<String, Object> param,
                                      HttpServletRequest request) {
        log.info("单据删除审核,{}", JSON.toJSONString(param));
        auth(appkey, param, request);
        if (Cools.isEmpty(param)) {
            return R.parse(BaseRes.PARAM);
        }
        boolean success = openService.orderDelete(param.get("id").toString());
        if (success) {
            return R.ok("单据删除成功");
        } else {
            return R.error("单据正在执行,删除失败");
        }
    }
    private void mappingPakInOrderParam(OrderProdSyncParam param, boolean pakin, String docName) {
        //生成单据主体
        OrderSyncParam orderSyncParam = new OrderSyncParam();
        Synchro.Copy(param, orderSyncParam);
        if (Cools.isEmpty(orderSyncParam.getCPOID())) {
            orderSyncParam.setCPOID(param.getOrderNoT());
        }
        if (Cools.isEmpty(orderSyncParam.getDdate())) {
            orderSyncParam.setDdate(param.getOrderTime());
        }
        if (!Cools.isEmpty(param.getCInvCode()) && param.getCInvCode().startsWith("60")) {
            return;
        }
        //生成单据明细
        OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
        Synchro.Copy(param, orderDetl);
        //orderDetl.setcInvCode(param.getCInvCode());
        //orderDetl.setiQuantity(param.getIQuantity());
        orderDetl.setCDefine22(param.getIvouchrowno());
        //orderDetl.setbFree1(param.getBFree1());
        orderDetl.setId(param.getId());
        orderDetl.setIvouchrowno(param.getIvouchrowno());
        orderDetl.setINum(param.getINum());
        orderDetl.setIinvexchrate(param.getIinvexchrate());
        //添加单据明细到单据主体
        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
        orderDetls.add(orderDetl);
        orderSyncParam.setChildren(orderDetls);
//        String docName = param.getIQuantity() > 0 ?  "银座产品生产入库单" : "入库退回单";
//        boolean pakin = param.getIQuantity() > 0 ? true : false;
        openService.syncOrder(orderSyncParam, pakin, docName);
        //return orderSyncParam;
    }
    private void mappingPakOutOrderParam(OrderProdSyncParam param, boolean pakin, String docName) {
        OrderSyncParam orderSyncParam = new OrderSyncParam();
        List<OrderProdSyncParam.ChildInfo> child = param.getChildren();
        Synchro.Copy(param, orderSyncParam);
        if (Cools.isEmpty(orderSyncParam.getCPOID())) {
            orderSyncParam.setCPOID(param.getOrderNoT());
            orderSyncParam.setDdate(param.getOrderTime());
        }
        //生成单据明细
        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
        for (OrderProdSyncParam.ChildInfo childInfo : child) {
            OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
            Synchro.Copy(childInfo, orderDetl);
            //orderDetl.setcInvCode(childInfo.getCInvCode());
            //orderDetl.setiQuantity(childInfo.getIQuantity());
            orderDetl.setCsocode(param.getCsocode());
            //orderDetl.setbFree1(childInfo.getBFree1());
            orderDetl.setId(Cools.isEmpty(childInfo.getIPOsID()) ? childInfo.getId() : childInfo.getIPOsID());
            orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
            if (!Cools.isEmpty(childInfo.getCFree1())) {
                orderDetl.setBFree1(childInfo.getCFree1());
            }
            orderDetls.add(orderDetl);
        }
        orderSyncParam.setChildren(orderDetls);
        openService.syncOrder(orderSyncParam, pakin, docName);
        //return orderSyncParam;
    }
    private void mappingOrderParamChild(OrderProdSyncParam param, boolean pakin, String docName) {
        OrderSyncParam orderSyncParam = new OrderSyncParam();
        List<OrderProdSyncParam.ChildInfo> child = param.getChildren();
        Synchro.Copy(param, orderSyncParam);
        orderSyncParam.set操作系统号(param.get操作系统号());
        orderSyncParam.setCPOID(child.get(0).getOrderNoT());
        orderSyncParam.setDdate(param.getOrderTime());
        //生成单据明细
        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
        for (OrderProdSyncParam.ChildInfo childInfo : child) {
            OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
            Synchro.Copy(childInfo, orderDetl);
            orderDetl.setCDefine22(param.getIvouchrowno());
            orderDetl.setCsocode(param.getCsocode());
            orderDetl.setId(childInfo.getIds());
            //orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
            if (!Cools.isEmpty(childInfo.getCFree1())) {
                orderDetl.setBFree1(childInfo.getCFree1());
            }
            orderDetls.add(orderDetl);
        }
        orderSyncParam.setChildren(orderDetls);
        openService.syncOrder(orderSyncParam, pakin, docName);
        //return orderSyncParam;
    }
    private void mappingOrderParam(OrderProdSyncParam param, boolean pakin, String docName) {
        //生成单据主体
        OrderSyncParam orderSyncParam = new OrderSyncParam();
        Synchro.Copy(param, orderSyncParam);
        if (Cools.isEmpty(orderSyncParam.getCPOID())) {
            orderSyncParam.setCPOID(param.getOrderNoT());
        }
        if (Cools.isEmpty(orderSyncParam.getDdate())) {
            orderSyncParam.setDdate(param.getOrderTime());
        }
        orderSyncParam.setCPOID("C" + orderSyncParam.getCPOID());
        //生成单据明细
        OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
        Synchro.Copy(param, orderDetl);
        if (!param.getCInvCode().startsWith("50")) {
            return;
        }
        //orderDetl.setcInvCode(param.getCInvCode());
        //orderDetl.setiQuantity(param.getIQuantity());
        orderDetl.setCDefine22(param.getIvouchrowno());
        //orderDetl.setbFree1(param.getBFree1());
        orderDetl.setId(param.getId());
        orderDetl.setIvouchrowno(param.getIvouchrowno());
        orderDetl.setINum(param.getINum());
        orderDetl.setIinvexchrate(param.getIinvexchrate());
        //添加单据明细到单据主体
        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
        orderDetls.add(orderDetl);
        orderSyncParam.setChildren(orderDetls);
//        String docName = param.getIQuantity() > 0 ?  "银座产品生产入库单" : "入库退回单";
//        boolean pakin = param.getIQuantity() > 0 ? true : false;
        openService.syncOrder(orderSyncParam, pakin, docName);
        //return orderSyncParam;
    }
    private void mappingOrderParamDB40(OrderProdSyncParam param, boolean pakin, String docName) {
        //生成单据主体
        OrderSyncParam orderSyncParam = new OrderSyncParam();
        Synchro.Copy(param, orderSyncParam);
        if (Cools.isEmpty(orderSyncParam.getCPOID())) {
            orderSyncParam.setCPOID(param.getOrderNoT());
        }
        if (Cools.isEmpty(orderSyncParam.getDdate())) {
            orderSyncParam.setDdate(param.getOrderTime());
        }
        orderSyncParam.setCPOID("DC" + orderSyncParam.getCPOID());
        //生成单据明细
        OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
        Synchro.Copy(param, orderDetl);
        if (!(param.getCInvCode().startsWith("401") || param.getCInvCode().startsWith("402"))) {
            return;
        }
        //orderDetl.setcInvCode(param.getCInvCode());
        //orderDetl.setiQuantity(param.getIQuantity());
        orderDetl.setCDefine22(param.getIvouchrowno());
        //orderDetl.setbFree1(param.getBFree1());
        orderDetl.setId(param.getId());
        orderDetl.setIvouchrowno(param.getIvouchrowno());
        orderDetl.setINum(param.getINum());
        orderDetl.setIinvexchrate(param.getIinvexchrate());
        //添加单据明细到单据主体
        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
        orderDetls.add(orderDetl);
        orderSyncParam.setChildren(orderDetls);
//        String docName = param.getIQuantity() > 0 ?  "银座产品生产入库单" : "入库退回单";
//        boolean pakin = param.getIQuantity() > 0 ? true : false;
        openService.syncOrder(orderSyncParam, pakin, docName);
        //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) {
//package com.zy.asrs.controller;
//
//                }
//            }
//import com.alibaba.fastjson.JSON;
//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.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;
//import lombok.extern.slf4j.Slf4j;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.web.bind.annotation.*;
//
//import javax.servlet.http.HttpServletRequest;
//import java.util.ArrayList;
//import java.util.List;
//import java.util.Map;
//
///**
// * Created by vincent on 2022/4/8
// */
//@Slf4j
//@RestController
//@RequestMapping("open/asrs")
//public class OpenController extends BaseController {
//
//    private static final boolean auth = true;
//    public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
//        add("ea1f0459efc02a79f046f982767939ae");
//    }};
//
//
//    @Autowired
//    private OpenService openService;
//
//
//    @Autowired
//    private ApiLogService apiLogService;
//
//
//    /**
//     * 库存统计
//     */
//    @RequestMapping("/stock/default/v1")
//    public R queryStock(@RequestHeader(required = false) String appkey,
//                        HttpServletRequest request) {
//        auth(appkey, null, request);
//        return R.ok().add(openService.queryStock());
//    }
//
//    /**
//     * 商品信息同步接口
//     */
//    @PostMapping("/mat/v1")
//    @AppAuth(memo = "物料同步接口")
//    public synchronized R syncMatInfoErp(@RequestHeader(required = false) String appkey,
//                                         @RequestBody(required = false) MatSyncParam param,
//                                         HttpServletRequest request) {
//        auth(appkey, param, request);
//        if (Cools.isEmpty(param)) {
//            return R.parse(BaseRes.PARAM);
//        }
//        return R.ok();
//        openService.syncMat(param);
//
//        return R.ok("更新成功");
//
//    }
}
//
//
//    private void auth(String appkey, Object obj, HttpServletRequest request) {
//        //log.info("{}接口被访问;appkey:{};请求数据:{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
//        request.setAttribute("cache", obj);
//        if (!auth) {
//            return;
//        }
//        if (Cools.isEmpty(appkey)) {
//            throw new CoolException("认证失败,请确认appkey无误!");
//        }
//        if (!APP_KEY_LIST.contains(appkey)) {
//            throw new CoolException("认证失败,请确认appkey无误!");
//        }
//    }
//
//
//    /*
//  盘点接口
//   */
//    @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("库存调整成功");
//
//    }
//
//    @PostMapping("/order/pakin/default/v1")
//    @AppAuth(memo = "生成入库单据")
//    public synchronized R orderPakin(@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.get操作单据();
//        if (Cools.isEmpty(docName)) {
//            docName = param.getOrderType();
//        }
//        switch (docName) {
//            case "Purchase":
//                mappingPakOutOrderParam(param, true, "银座采购入库单");
//                break;
//            case "MO":
//                mappingPakInOrderParam(param, true, "银座委外生产订单");
//                mappingOrderParam(param, false, "银座未包装成品出库单");
//                mappingOrderParamDB40(param, false, "半成品调拨单");
//                //mappingOrderParam40(param, false, "半成品出库单");
//                if (!Cools.isEmpty(param.getChildren())) {
//                    mappingOrderParamChild(param, false, "银座委外材料出库单");
//                }
//                break;
//            case "OM":
//                mappingPakInOrderParam(param, true, "银座生产订单");
//                mappingOrderParam(param, false, "银座委外未包装成品出库单");
//                if (!Cools.isEmpty(param.getChildren())) {
//                    mappingOrderParamChild(param, false, "银座生产材料出库单");
//                }
//                break;
//            case "采购入库单退货":
//                mappingPakOutOrderParam(param, false, "银座采购入库单退货");
//                break;
//            case "委外入库单退货":
//                mappingPakOutOrderParam(param, false, "银座委外入库单退货");
//                break;
//            case "其他出库单":
//                mappingPakOutOrderParam(param, false, "其他出库单");
//                break;
//            case "其他入库单":
//                mappingPakOutOrderParam(param, true, "其他入库单");
//                break;
//            case "委外材料出库退料":
//                mappingPakOutOrderParam(param, true, "银座委外材料出库退料");
//                break;
//            case "生产材料出库退料":
//                mappingPakOutOrderParam(param, true, "银座生产材料出库退料");
//                break;
//            case "委外材料出库补料":
//                mappingPakOutOrderParam(param, false, "银座委外材料出库补料");
//                break;
//            case "生产材料出库补料":
//                mappingPakOutOrderParam(param, false, "银座生产材料出库补料");
//                break;
//
//            case "半成品入库单":
//                mappingPakOutOrderParam(param, true, "半成品入库单");
//                break;
//            case "成品入库单":
//                mappingPakOutOrderParam(param, true, "成品入库单");
//                break;
//            default:
//                log.info("未知的单据类型:{}", param);
//                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
//                break;
//        }
//
//        return R.ok("单据接受成功");
//
//    }
//
//
//    @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));
//        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.get操作单据();
//        switch (docName) {
//            case "Purchase":
//                mappingPakOutOrderParam(param, true, "银座采购入库单");
//                break;
//            case "MO":
//                mappingPakInOrderParam(param, true, "银座生产订单");
//                mappingOrderParam(param, false, "银座未包装成品出库单");
//                mappingOrderParamDB40(param, false, "半成品调拨单");
//                //mappingOrderParam40(param, false, "半成品出库单");
//                if (!Cools.isEmpty(param.getChildren())) {
//                    mappingOrderParamChild(param, false, "银座生产材料出库单");
//                }
//                break;
//            case "OM":
//                mappingPakInOrderParam(param, true, "银座委外生产订单");
//                mappingOrderParam(param, false, "银座委外未包装成品出库单");
//                if (!Cools.isEmpty(param.getChildren())) {
//                    mappingOrderParamChild(param, false, "银座委外材料出库单");
//                }
//                break;
//            case "采购入库单退货":
//                mappingPakOutOrderParam(param, false, "银座采购入库单退货");
//                break;
//            case "委外入库单退货":
//                mappingPakOutOrderParam(param, false, "银座委外入库单退货");
//                break;
//            case "其他出库单":
//                mappingPakOutOrderParam(param, false, "其他出库单");
//                break;
//            case "其他入库单":
//                mappingPakOutOrderParam(param, true, "其他入库单");
//                break;
//            case "委外材料出库退料":
//                mappingPakOutOrderParam(param, true, "银座委外材料出库退料");
//                break;
//            case "生产材料出库退料":
//                mappingPakOutOrderParam(param, true, "银座生产材料出库退料");
//                break;
//            case "委外材料出库补料":
//                mappingPakOutOrderParam(param, false, "银座委外材料出库补料");
//                break;
//            case "生产材料出库补料":
//                mappingPakOutOrderParam(param, false, "银座生产材料出库补料");
//                break;
//            case "半成品入库单":
//                mappingPakOutOrderParam(param, true, "半成品入库单");
//                break;
//            case "成品入库单":
//                mappingPakOutOrderParam(param, true, "成品入库单");
//                break;
//            default:
//                log.info("未知的单据类型:{}", param);
//                mappingPakOutOrderParam(param, param.getPakin() == 1 ? true : false, param.get操作单据());
//                break;
//        }
//        return R.ok("单据接受成功");
//
//    }
//
//    @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 = "单据删除审核")
//    public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
//                                      @RequestBody(required = false) Map<String, Object> param,
//                                      HttpServletRequest request) {
//        log.info("单据删除审核,{}", JSON.toJSONString(param));
//        auth(appkey, param, request);
//        if (Cools.isEmpty(param)) {
//            return R.parse(BaseRes.PARAM);
//        }
//
//        boolean success = openService.orderDelete(param.get("id").toString());
//
//        if (success) {
//            return R.ok("单据删除成功");
//        } else {
//            return R.error("单据正在执行,删除失败");
//        }
//
//    }
//
//    private void mappingPakInOrderParam(OrderProdSyncParam param, boolean pakin, String docName) {
//        //生成单据主体
//        OrderSyncParam orderSyncParam = new OrderSyncParam();
//        Synchro.Copy(param, orderSyncParam);
//
//        if (Cools.isEmpty(orderSyncParam.getCPOID())) {
//            orderSyncParam.setCPOID(param.getOrderNoT());
//        }
//        if (Cools.isEmpty(orderSyncParam.getDdate())) {
//            orderSyncParam.setDdate(param.getOrderTime());
//        }
//
//        if (!Cools.isEmpty(param.getCInvCode()) && param.getCInvCode().startsWith("60")) {
//            return;
//        }
//
//        //生成单据明细
//        OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
//        Synchro.Copy(param, orderDetl);
//        //orderDetl.setcInvCode(param.getCInvCode());
//        //orderDetl.setiQuantity(param.getIQuantity());
//        orderDetl.setCDefine22(param.getIvouchrowno());
//        //orderDetl.setbFree1(param.getBFree1());
//        orderDetl.setId(param.getId());
//        orderDetl.setIvouchrowno(param.getIvouchrowno());
//        orderDetl.setINum(param.getINum());
//        orderDetl.setIinvexchrate(param.getIinvexchrate());
//
//        //添加单据明细到单据主体
//        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
//        orderDetls.add(orderDetl);
//
//        orderSyncParam.setChildren(orderDetls);
//
////        String docName = param.getIQuantity() > 0 ?  "银座产品生产入库单" : "入库退回单";
////        boolean pakin = param.getIQuantity() > 0 ? true : false;
//
//        openService.syncOrder(orderSyncParam, pakin, docName);
//
//        //return orderSyncParam;
//    }
//
//
//    private void mappingPakOutOrderParam(OrderProdSyncParam param, boolean pakin, String docName) {
//        OrderSyncParam orderSyncParam = new OrderSyncParam();
//
//        List<OrderProdSyncParam.ChildInfo> child = param.getChildren();
//        Synchro.Copy(param, orderSyncParam);
//        if (Cools.isEmpty(orderSyncParam.getCPOID())) {
//            orderSyncParam.setCPOID(param.getOrderNoT());
//            orderSyncParam.setDdate(param.getOrderTime());
//        }
//
//        //生成单据明细
//        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
//
//        for (OrderProdSyncParam.ChildInfo childInfo : child) {
//            OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
//            Synchro.Copy(childInfo, orderDetl);
//            //orderDetl.setcInvCode(childInfo.getCInvCode());
//            //orderDetl.setiQuantity(childInfo.getIQuantity());
//            orderDetl.setCsocode(param.getCsocode());
//            //orderDetl.setbFree1(childInfo.getBFree1());
//            orderDetl.setId(Cools.isEmpty(childInfo.getIPOsID()) ? childInfo.getId() : childInfo.getIPOsID());
//            orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
//            if (!Cools.isEmpty(childInfo.getCFree1())) {
//                orderDetl.setBFree1(childInfo.getCFree1());
//            }
//            orderDetls.add(orderDetl);
//        }
//        orderSyncParam.setChildren(orderDetls);
//
//        openService.syncOrder(orderSyncParam, pakin, docName);
//
//        //return orderSyncParam;
//    }
//
//    private void mappingOrderParamChild(OrderProdSyncParam param, boolean pakin, String docName) {
//        OrderSyncParam orderSyncParam = new OrderSyncParam();
//
//        List<OrderProdSyncParam.ChildInfo> child = param.getChildren();
//        Synchro.Copy(param, orderSyncParam);
//        orderSyncParam.set操作系统号(param.get操作系统号());
//        orderSyncParam.setCPOID(child.get(0).getOrderNoT());
//        orderSyncParam.setDdate(param.getOrderTime());
//
//        //生成单据明细
//        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
//
//        for (OrderProdSyncParam.ChildInfo childInfo : child) {
//            OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
//            Synchro.Copy(childInfo, orderDetl);
//            orderDetl.setCDefine22(param.getIvouchrowno());
//            orderDetl.setCsocode(param.getCsocode());
//            orderDetl.setId(childInfo.getIds());
//            //orderDetl.setIvouchrowno(childInfo.getIvouchrowno());
//            if (!Cools.isEmpty(childInfo.getCFree1())) {
//                orderDetl.setBFree1(childInfo.getCFree1());
//            }
//            orderDetls.add(orderDetl);
//        }
//        orderSyncParam.setChildren(orderDetls);
//
//        openService.syncOrder(orderSyncParam, pakin, docName);
//
//        //return orderSyncParam;
//    }
//
//
//    private void mappingOrderParam(OrderProdSyncParam param, boolean pakin, String docName) {
//        //生成单据主体
//        OrderSyncParam orderSyncParam = new OrderSyncParam();
//        Synchro.Copy(param, orderSyncParam);
//
//        if (Cools.isEmpty(orderSyncParam.getCPOID())) {
//            orderSyncParam.setCPOID(param.getOrderNoT());
//        }
//        if (Cools.isEmpty(orderSyncParam.getDdate())) {
//            orderSyncParam.setDdate(param.getOrderTime());
//        }
//        orderSyncParam.setCPOID("C" + orderSyncParam.getCPOID());
//        //生成单据明细
//        OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
//        Synchro.Copy(param, orderDetl);
//
//        if (!param.getCInvCode().startsWith("50")) {
//            return;
//        }
//        //orderDetl.setcInvCode(param.getCInvCode());
//        //orderDetl.setiQuantity(param.getIQuantity());
//        orderDetl.setCDefine22(param.getIvouchrowno());
//        //orderDetl.setbFree1(param.getBFree1());
//        orderDetl.setId(param.getId());
//        orderDetl.setIvouchrowno(param.getIvouchrowno());
//        orderDetl.setINum(param.getINum());
//        orderDetl.setIinvexchrate(param.getIinvexchrate());
//
//        //添加单据明细到单据主体
//        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
//        orderDetls.add(orderDetl);
//
//        orderSyncParam.setChildren(orderDetls);
//
////        String docName = param.getIQuantity() > 0 ?  "银座产品生产入库单" : "入库退回单";
////        boolean pakin = param.getIQuantity() > 0 ? true : false;
//
//        openService.syncOrder(orderSyncParam, pakin, docName);
//
//        //return orderSyncParam;
//    }
//
//    private void mappingOrderParamDB40(OrderProdSyncParam param, boolean pakin, String docName) {
//        //生成单据主体
//        OrderSyncParam orderSyncParam = new OrderSyncParam();
//        Synchro.Copy(param, orderSyncParam);
//
//        if (Cools.isEmpty(orderSyncParam.getCPOID())) {
//            orderSyncParam.setCPOID(param.getOrderNoT());
//        }
//        if (Cools.isEmpty(orderSyncParam.getDdate())) {
//            orderSyncParam.setDdate(param.getOrderTime());
//        }
//        orderSyncParam.setCPOID("DC" + orderSyncParam.getCPOID());
//        //生成单据明细
//        OrderSyncParam.OrderDetl orderDetl = new OrderSyncParam.OrderDetl();
//        Synchro.Copy(param, orderDetl);
//
//        if (!(param.getCInvCode().startsWith("401") || param.getCInvCode().startsWith("402"))) {
//            return;
//        }
//        //orderDetl.setcInvCode(param.getCInvCode());
//        //orderDetl.setiQuantity(param.getIQuantity());
//        orderDetl.setCDefine22(param.getIvouchrowno());
//        //orderDetl.setbFree1(param.getBFree1());
//        orderDetl.setId(param.getId());
//        orderDetl.setIvouchrowno(param.getIvouchrowno());
//        orderDetl.setINum(param.getINum());
//        orderDetl.setIinvexchrate(param.getIinvexchrate());
//
//        //添加单据明细到单据主体
//        List<OrderSyncParam.OrderDetl> orderDetls = new ArrayList<>();
//        orderDetls.add(orderDetl);
//
//        orderSyncParam.setChildren(orderDetls);
//
////        String docName = param.getIQuantity() > 0 ?  "银座产品生产入库单" : "入库退回单";
////        boolean pakin = param.getIQuantity() > 0 ? true : false;
//
//        openService.syncOrder(orderSyncParam, pakin, docName);
//
//        //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();
////
////    }
//
//}
src/main/java/com/zy/asrs/controller/OrderController.java
@@ -441,6 +441,14 @@
            return R.error("单据编号已存在");
        }
        Date now = new Date();
        if (param.getDocType() == 33) {
            for (OrderDetl orderDetl : param.getOrderDetlList()) {
                if (orderDetl.getMatnr().startsWith("401") || orderDetl.getMatnr().startsWith("402")) {
                    param.setOrderNo("DC" + param.getOrderNo());
                    break;
                }
            }
        }
        order = new Order(
                String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                param.getOrderNo(),    // 订单编号
@@ -558,9 +566,15 @@
            }
        }
        if (param.getDocType().intValue() == 32) {
            String ono = "DB";
            for (OrderDetl orderDetl : param.getOrderDetlList()) {
                if (orderDetl.getMatnr().startsWith("401") || orderDetl.getMatnr().startsWith("402")) {
                    ono = "DC";
                }
            }
            order = new Order(
                    String.valueOf(snowflakeIdWorker.nextId()),    // 编号[非空]
                    "DB" + param.getOrderNo(),    // 订单编号
                    ono + param.getOrderNo(),    // 订单编号
                    DateUtils.convert(now),    // 单据日期
                    33L,    // 单据类型
                    null,    // 项目编号
@@ -1188,7 +1202,12 @@
            }
            // 生成调拨单
            if (docType.getDocId().intValue() == 32) {
                String dbUuid = "DB" + odNo;
                String dbUuid;
                if (!Cools.isEmpty(matnr) && (matnr.startsWith("401") || matnr.startsWith("402"))) {
                    dbUuid = "DC" + odNo;
                } else {
                    dbUuid = "DB" + odNo;
                }
                Order order2 = orderService.selectByNo(dbUuid);
                if (null == order2) {
                    order2 = new Order(
@@ -1455,7 +1474,12 @@
                odNo += "_O";
            }
            if (docName.contains("调拨单")) {
                odNo = "DB" + odNo;
                if (!Cools.isEmpty(matnr) && (matnr.startsWith("401") || matnr.startsWith("402"))) {
                    odNo = "DC" + odNo;
                } else {
                    odNo = "DB" + odNo;
                }
                //odNo = "DB" + odNo;
            } else if (docName.contains("加工单")) {
                odNo = "JG" + odNo;
            } else {
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -68,7 +68,7 @@
    }
    //@Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(fixedDelay = 600000)
    //@Scheduled(fixedDelay = 600000)
    //@Async("orderThreadPool")
    public void completeAndReport() {
        String erpReport = Parameter.get().getErpReport();
@@ -101,7 +101,7 @@
    //@Scheduled(cron = "* 0/5 * * * ? ")
    //@Scheduled(cron = "0/30 * * * * ? ")
    @Scheduled(fixedDelay = 30000)
    //@Scheduled(fixedDelay = 30000)
    //@Async("orderThreadPool")
    public synchronized void reportOrder() {
        DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "银座采购入库单"));
src/main/webapp/views/order/order.html
@@ -99,14 +99,14 @@
                        <button id="importOrder" class="layui-btn icon-btn btn-add">
                            <i class="layui-icon layui-icon-upload"></i>&nbsp;导入单据
                        </button>
                        <button id="importBcpOrder" class="layui-btn icon-btn btn-add2">
                            <i class="layui-icon layui-icon-upload"></i>&nbsp;导入半成品箱壳单据
                        </button>
<!--                        <button id="importBcpOrder" class="layui-btn icon-btn btn-add2">-->
<!--                            <i class="layui-icon layui-icon-upload"></i>&nbsp;导入半成品箱壳单据-->
<!--                        </button>-->
                        <button id="orderCheckBtn" class="layui-btn icon-btn btn-add">
                            <i class="layui-icon">&#xe654;</i>添加
                        </button>
                        <input style="display:none" id="importExcel" type="file" onchange="upload(this)" >
                        <input style="display:none" id="importBcpExcel" type="file" onchange="upload3(this)" >
<!--                        <input style="display:none" id="importBcpExcel" type="file" onchange="upload3(this)" >-->
                        <input style="display:none" id="importExcel2" type="file" onchange="upload2(this)" >
                    </div>
                </div>