From 7299282e6d9bfb7cf008477c2af888b3930bd716 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期四, 20 二月 2025 10:46:49 +0800
Subject: [PATCH] 兼容四期
---
src/main/java/com/zy/asrs/controller/OrderController.java | 30 ++++++---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 13 +++-
src/main/java/com/zy/asrs/controller/OpenController.java | 93 +++++++++++++++++++++++++++++-
src/main/java/com/zy/asrs/controller/OrderDetlController.java | 11 ++-
src/main/java/com/zy/asrs/controller/OutController.java | 5 +
5 files changed, 129 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 12294d2..5de23fc 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,14 +1,11 @@
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;
@@ -22,9 +19,7 @@
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;
@@ -138,6 +133,8 @@
case "MO":
mappingPakInOrderParam(param, true, "閾跺骇濮斿鐢熶骇璁㈠崟");
mappingOrderParam(param, false, "閾跺骇鏈寘瑁呮垚鍝佸嚭搴撳崟");
+ mappingOrderParamDB40(param, false, "鍗婃垚鍝佽皟鎷ㄥ崟");
+ mappingOrderParam40(param, false, "鍗婃垚鍝佸嚭搴撳崟");
if (!Cools.isEmpty(param.getChildren())) {
mappingOrderParamChild(param, false, "閾跺骇濮斿鏉愭枡鍑哄簱鍗�");
}
@@ -212,6 +209,8 @@
case "MO":
mappingPakInOrderParam(param, true, "閾跺骇鐢熶骇璁㈠崟");
mappingOrderParam(param, false, "閾跺骇鏈寘瑁呮垚鍝佸嚭搴撳崟");
+ mappingOrderParamDB40(param, false, "鍗婃垚鍝佽皟鎷ㄥ崟");
+ mappingOrderParam40(param, false, "鍗婃垚鍝佸嚭搴撳崟");
if (!Cools.isEmpty(param.getChildren())) {
mappingOrderParamChild(param, false, "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�");
}
@@ -477,6 +476,90 @@
//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;
+ }
+
+ private void mappingOrderParam40(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("EB" + 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 {
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 000fe9f..50a5d9c 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -220,16 +221,20 @@
@RequestMapping(value = "/order/detls/pakin/page/auth/v2")
@ManagerAuth
public R orderDetlsV2(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "100") Integer limit,
- @RequestParam(required = false) String orderByField,
- @RequestParam(required = false) String orderByType,
- @RequestParam Map<String, Object> param) {
+ @RequestParam(defaultValue = "100") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
Object o = param.get("orderType");
if (o != null) {
String[] split = o.toString().split(",");
- wrapper.in("source", split);
+ if (split[0].equals("39")) {
+ wrapper.in("source", split).andNew().like("matnr", "401", SqlLike.RIGHT).or().like("matnr", "402", SqlLike.RIGHT);
+ } else {
+ wrapper.in("source", split);
+ }
param.remove("orderType");
}
convert(param, wrapper);
@@ -299,10 +304,11 @@
List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
List<Long> docIds = new ArrayList<>();
for (DocType pakin : pakins) {
- if (pakin.getDocId() == 36||pakin.getDocId() == 39) {
+ if (pakin.getDocId() == 36 || pakin.getDocId() == 39) {
docIds.add(pakin.getDocId());
}
}
+ wrapper.like("matnr", "50", SqlLike.RIGHT);
wrapper.in("source", docIds);
return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
@@ -348,6 +354,7 @@
docIds.add(pakin.getDocId());
}
}
+ wrapper.notLike("matnr", "401", SqlLike.RIGHT).notLike("matnr", "402", SqlLike.RIGHT);
wrapper.in("source", docIds);
Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
for (OrderDetl record : page.getRecords()) {
@@ -361,10 +368,10 @@
@RequestMapping(value = "/order/bcpDb/detls/pakin/page/auth/v2")
@ManagerAuth
public R bcpDbOrderDetlsV2(@RequestParam(defaultValue = "1") Integer curr,
- @RequestParam(defaultValue = "100") Integer limit,
- @RequestParam(required = false) String orderByField,
- @RequestParam(required = false) String orderByType,
- @RequestParam Map<String, Object> param) {
+ @RequestParam(defaultValue = "100") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
excludeTrash(param);
Object o = param.get("orderType");
@@ -382,7 +389,8 @@
// docIds.add(pakin.getDocId());
// }
// }
- //wrapper.in("source", docIds);
+ wrapper.like("order_no", "DC", SqlLike.RIGHT);
+ // wrapper.in("source", docIds);
Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
for (OrderDetl record : page.getRecords()) {
Double sumAnfme = agvLocDetlService.getSumAnfmeDb(record.getMatnr(), record.getThreeCode(), 1);
diff --git a/src/main/java/com/zy/asrs/controller/OrderDetlController.java b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
index fe28832..8f7f771 100644
--- a/src/main/java/com/zy/asrs/controller/OrderDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderDetlController.java
@@ -1,6 +1,7 @@
package com.zy.asrs.controller;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.enums.SqlLike;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -16,7 +17,6 @@
import com.zy.common.web.BaseController;
import lombok.Synchronized;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.StopWatch;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -199,10 +199,15 @@
Object o = param.get("orderType");
if (o != null) {
String[] split = o.toString().split(",");
- wrapper.in("source", split);
+ //-1璇存槑鏄崐鎴愬搧绠卞３鍑哄簱鍗�
+ if (split[0].equals("-1")) {
+ wrapper.like("order_no", "EB", SqlLike.RIGHT);
+ wrapper.in("source", split);
+ } else {
+ wrapper.in("source", split);
+ }
param.remove("orderType");
}
-
convertLike(param, wrapper);
if (!Cools.isEmpty(orderByField)) {
wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 9e8d0b8..801d229 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -160,6 +160,11 @@
}
+ /**
+ * 浜屽巶
+ * @param ids
+ * @return
+ */
@PostMapping("/bcp/out/pakout/preview/auth/v2")
@ManagerAuth
public R bcpPakoutPreviewV2(@RequestBody List<Long> ids) {
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index f0925a4..f7791fb 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -100,13 +100,17 @@
//鏍规嵁鐗╂枡鍙峰拰鎵规鎵惧埌瀵瑰簲鐨勫簱瀛橈紝骞朵笖鎸夌収淇敼鏃堕棿鎺掑簭
Wrapper<AgvLocDetl> wrapper = new EntityWrapper<AgvLocDetl>().eq("matnr", matnr).orderBy("modi_time");
if (type != null) {
- if (type.equals(AsrsConstants.ERCHANG)){
+ if (type.equals(AsrsConstants.ERCHANG)) {
wrapper.notLike("loc_no", "F3");
- }else {
- wrapper.notLike("loc_no", "F1");
+ } else {
+ if (matnr.startsWith("401") || matnr.startsWith("402")) {
+ //wrapper.notLike("loc_no", "F3");
+ } else {
+ wrapper.notLike("loc_no", "F1");
+ }
}
}
- //涓�鑷存湁PE甯︽壒娆″瓧娈靛鑷达紝鏃犳硶鍑哄簱锛屽氨娉ㄩ噴鎺�
+ //涓�鐩存湁PE甯︽壒娆″瓧娈靛鑷达紝鏃犳硶鍑哄簱锛屽氨娉ㄩ噴鎺�
//wapperSetCondition(wrapper, "batch", batch);
wapperSetCondition(wrapper, "three_code", csocode);
//wapperSetCondition(wrapper, "dead_time", isoseq);
@@ -185,6 +189,7 @@
}
+
/*
鏇存柊搴撳瓨鏄庣粏
*/
--
Gitblit v1.9.1