From 63676447b730800bc7ba3df060bf867713db98f4 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 04 六月 2025 12:55:02 +0800
Subject: [PATCH] 关闭与erp的对接
---
src/main/java/com/zy/asrs/controller/OrderController.java | 30 +
src/main/java/com/zy/asrs/controller/OpenController.java | 1078 ++++++++++++++++++++++++++++----------------------------
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 4
src/main/webapp/views/order/order.html | 8
4 files changed, 572 insertions(+), 548 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 6a56c94..d99a3b3 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/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();
+////
+//// }
+//
+//}
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index bc971bd..c96b978 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/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 {
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 89e0871..8003028 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/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", "閾跺骇閲囪喘鍏ュ簱鍗�"));
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 9d6de03..ff3b2b6 100644
--- a/src/main/webapp/views/order/order.html
+++ b/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> 瀵煎叆鍗曟嵁
</button>
- <button id="importBcpOrder" class="layui-btn icon-btn btn-add2">
- <i class="layui-icon layui-icon-upload"></i> 瀵煎叆鍗婃垚鍝佺澹冲崟鎹�
- </button>
+<!-- <button id="importBcpOrder" class="layui-btn icon-btn btn-add2">-->
+<!-- <i class="layui-icon layui-icon-upload"></i> 瀵煎叆鍗婃垚鍝佺澹冲崟鎹�-->
+<!-- </button>-->
<button id="orderCheckBtn" class="layui-btn icon-btn btn-add">
<i class="layui-icon"></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>
--
Gitblit v1.9.1