From d814bde01eb91d1544b718463cd31317726bbf6b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 十二月 2023 21:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/resources/mapper/OrderMapper.xml | 2
src/main/java/com/zy/asrs/task/kingdee/PushDowmOrderSyncScheduler.java | 13 +
src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java | 28 ++-
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 104 +++++++++++++-
src/main/java/com/zy/asrs/controller/OpenController.java | 7 +
src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java | 27 ++-
src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java | 47 +++---
src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java | 58 +++++++-
src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java | 21 ++
src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java | 8 -
src/main/java/com/zy/erp/kingdee/entity/param/SaceOrderOtherParam.java | 18 ++
src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java | 15 +
src/main/webapp/static/js/order/order.js | 7 +
src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java | 6
src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java | 24 ++-
src/main/java/com/zy/common/model/DetlDto.java | 2
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4
src/main/resources/application.yml | 13 +
src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java | 9 -
19 files changed, 315 insertions(+), 98 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index c4489ad..58ca066 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -64,12 +64,16 @@
if (Cools.isEmpty(param1.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
+ if (Cools.isEmpty(param1.getId())) {
+ return R.error("鍗曟嵁鍞竴鍊糩id]涓嶈兘涓虹┖");
+ }
if (Cools.isEmpty(param1.getFormId())) {
return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
}
if (Cools.isEmpty(param1.getMatList())) {
return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
}
+
List<Map<String, Object>> result = new ArrayList<>();
@@ -129,6 +133,9 @@
if (Cools.isEmpty(param1.getOrderNo())) {
return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
}
+ if (Cools.isEmpty(param1.getId())) {
+ return R.error("鍗曟嵁鍞竴鍊糩id]涓嶈兘涓虹┖");
+ }
if (Cools.isEmpty(param1.getFormId())) {
return R.error("鍗曟嵁绫诲瀷[FormId]涓嶈兘涓虹┖");
}
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java
index 0186168..0ff27ae 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinJDParam.java
@@ -19,6 +19,8 @@
private String createDate;
+ private String type;//绫诲瀷 (1銆佹暣鍗曚笂鎶� 2銆佽鍙蜂笂鎶�)
+
private List<DetlDto2> matList;
@Data
@@ -34,15 +36,17 @@
private Double anfme;
private String owner;
+ private int beBatch;
public DetlDto2(){}
- public DetlDto2(String matnr,String maktx,String batch,String specs,Double anfme,String owner){
+ public DetlDto2(String matnr,String maktx,String batch,String specs,Double anfme,String owner,int beBatch){
this.matnr=matnr;
this.maktx=maktx;
this.batch=batch;
this.specs=specs;
this.anfme=anfme;
this.owner=owner;
+ this.beBatch=beBatch;
}
}
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
index 3db2aae..8773557 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakinParam.java
@@ -28,13 +28,8 @@
public OpenOrderPakinParam(OpenOrderPakinJDParam param1){
this.orderNo=param1.getOrderNo();
- KingDeeUtilType kingDeeUtilType = KingDeeUtilType.getFormId(param1.getFormId());
- if (Cools.isEmpty(kingDeeUtilType)){
- this.orderType=param1.getFormId();
- }else {
- this.orderType=kingDeeUtilType.desc;
- }
-
+ KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(param1.getId());
+ this.orderType=kingDeeUtilType.desc;
this.orderTime=param1.getCreateDate();
List<OpenOrderPakinJDParam.DetlDto2> matList = param1.getMatList();
List<DetlDto> dtos = new ArrayList<>();
diff --git a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
index 26f185b..8c12d19 100644
--- a/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java
@@ -29,13 +29,7 @@
public OpenOrderPakoutParam(OpenOrderPakinJDParam param1){
this.orderNo=param1.getOrderNo();
- KingDeeUtilType kingDeeUtilType = null;
- if (!Cools.isEmpty(param1.getId())){
- kingDeeUtilType = KingDeeUtilType.get(param1.getId());
- }
- if (Cools.isEmpty(kingDeeUtilType)){
- kingDeeUtilType = KingDeeUtilType.getFormId(param1.getFormId());
- }
+ KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(param1.getId());
if (Cools.isEmpty(kingDeeUtilType)){
this.orderType=param1.getFormId();
}else {
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 76b6e81..ee02c94 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -132,6 +132,7 @@
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme(),detail.getOwnerName(),detail.getPayment());
+ dto.setBeBatch(detail.getBeBatch());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -172,6 +173,7 @@
orderDetl.setPayment(detlDto.getPayment());
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setBeBatch(detlDto.getBeBatch());
orderDetl.setWeight(detlDto.getWeight());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
@@ -237,6 +239,7 @@
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ dto.setBeBatch(detail.getBeBatch());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -263,6 +266,7 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setBeBatch(detlDto.getBeBatch());
orderDetl.setWeight(detlDto.getWeight());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
diff --git a/src/main/java/com/zy/asrs/task/kingdee/PushDowmOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/PushDowmOrderSyncScheduler.java
index 147edca..b2e80c5 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/PushDowmOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/PushDowmOrderSyncScheduler.java
@@ -10,6 +10,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.Date;
import java.util.List;
/*
@@ -33,9 +34,15 @@
}
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
- ReturnT<String> result = pushDowmOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo());
+ try{
+ ReturnT<String> result = pushDowmOrderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo());
+ }
+ }catch (Exception e){
+ Order order1 = orderService.selectById(order.getId());
+ order1.setUpdateTime(new Date());
+ orderService.updateById(order1);
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
index 994040d..9e16279 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
@@ -11,6 +11,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.Date;
import java.util.List;
/**
@@ -28,7 +29,7 @@
@Value("${erp.switch.ReviewOrderSwitch}")
private boolean ReviewOrderSwitch;
- @Scheduled(cron = "0/3 * * * * ? ")
+// @Scheduled(cron = "0/3 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReport(){
if(!ReviewOrderSwitch){
@@ -36,9 +37,15 @@
}
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
- ReturnT<String> result = reviewOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鍚慹rp瀹℃牳澶辫触", order.getOrderNo());
+ try{
+ ReturnT<String> result = reviewOrderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]鍚慹rp瀹℃牳澶辫触", order.getOrderNo());
+ }
+ }catch (Exception e){
+ Order order1 = orderService.selectById(order.getId());
+ order1.setUpdateTime(new Date());
+ orderService.updateById(order1);
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
index 161ae37..2ffb8de 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -3,13 +3,15 @@
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.kingdee.handler.SubmitOrderSyncHandler;
+import com.zy.asrs.task.kingdee.handler.SaveOrderSyncHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.Date;
import java.util.List;
/**
@@ -18,27 +20,31 @@
@Slf4j
@Component
public class SaveOrderSyncScheduler {
-
@Autowired
- private SubmitOrderSyncHandler submitOrderSyncHandler;
+ private SaveOrderSyncHandler saveOrderSyncHandler;
@Autowired
private OrderService orderService;
- @Value("${erp.switch.ReviewOrderSwitch}")
- private boolean ReviewOrderSwitch;
+ @Value("${erp.switch.SaveOrderSwitch}")
+ private boolean SaveOrderSwitch;
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReport(){
- if (1==1) return;
- if(!ReviewOrderSwitch){
+ if(!SaveOrderSwitch){
return;
}
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
- ReturnT<String> result = submitOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo());
+ try{
+ ReturnT<String> result = saveOrderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo());
+ }
+ }catch (Exception e){
+ Order order1 = orderService.selectById(order.getId());
+ order1.setUpdateTime(new Date());
+ orderService.updateById(order1);
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
index 1f23ca4..1c4e3c6 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
@@ -3,7 +3,8 @@
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.asrs.task.kingdee.handler.SaveOrderSyncHandler;
+
+import com.zy.asrs.task.kingdee.handler.SubmitOrderSyncHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -11,6 +12,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.Date;
import java.util.List;
/**
@@ -21,24 +23,30 @@
public class SubmitOrderSyncScheduler {
@Autowired
- private SaveOrderSyncHandler saveOrderSyncHandler;
+ private SubmitOrderSyncHandler submitOrderSyncHandler;
@Autowired
private OrderService orderService;
- @Value("${erp.switch.ReviewOrderSwitch}")
- private boolean ReviewOrderSwitch;
+ @Value("${erp.switch.SubmitOrderSwitch}")
+ private boolean SubmitOrderSwitch;
// @Scheduled(cron = "0/3 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReport(){
- if(!ReviewOrderSwitch){
+ if(!SubmitOrderSwitch){
return;
}
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
- ReturnT<String> result = saveOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
+ try{
+ ReturnT<String> result = submitOrderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
+ }
+ }catch (Exception e){
+ Order order1 = orderService.selectById(order.getId());
+ order1.setUpdateTime(new Date());
+ orderService.updateById(order1);
}
}
}
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java
index c9e9340..67bc964 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/PushDowmOrderSyncHandler.java
@@ -4,10 +4,15 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -19,7 +24,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Set;
/**
@@ -38,6 +45,8 @@
@Autowired
private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
@Autowired
private ApiLogService apiLogService;
@Autowired
@@ -60,11 +69,33 @@
}
KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
+ if (kingDeeUtilType.entryId>1){
+ Order order1 = orderService.selectById(order.getId());
+ order1.setUpdateTime(new Date());
+ orderService.updateById(order1);
+ return SUCCESS;
+ }
//鏉′欢鎷兼帴
log.info("鏉′欢鎷兼帴");
+ String entryIds = null;
+ if (kingDeeUtilType.entryId==1){
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ for (OrderDetl orderDetl:orderDetls){
+ if (Cools.isEmpty(entryIds)){
+ entryIds = orderDetl.getBeBatch().toString();
+ }else {
+ entryIds = entryIds+"," +orderDetl.getBeBatch();
+ }
+ }
+ orderNoS = "";
+ }
+ if (Cools.isEmpty(entryIds)){
+ entryIds = "";
+ }
+
JSONObject dataJsonObject = new JSONObject();
dataJsonObject.put("Numbers",orderNoS);
- dataJsonObject.put("EntryIds","");
+ dataJsonObject.put("EntryIds",entryIds);
dataJsonObject.put("RuleId",kingDeeUtilType.ruleId);
dataJsonObject.put("TargetFormId",kingDeeUtilType.correspondingFormId);
@@ -90,14 +121,27 @@
.setHttps(true)
.build()
.doPost();
- JSONObject data = JSON.parseObject(response);
+// JSONObject data = JSON.parseObject(response);
log.info("涓嬫帹response:"+response);
Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool=IsSuccess.toString();
- //涓嬫帹瀹屾垚鍘熻鍗�4杞�6 6.涓婃姤瀹屾垚
- if(bool.equals("true")){
- success = true;
- order.setSettle(6L);
+ String bool1=IsSuccess.toString();
+ if (bool1.equals("true")){
+ ObjectMapper objectMapper = new ObjectMapper();
+ JsonNode rootNode = objectMapper.readTree(response);
+ boolean bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
+ log.info("涓嬫帹bool:"+bool);
+
+ //涓嬫帹瀹屾垚鍘熻鍗�4杞�6 6.涓婃姤瀹屾垚
+ if(bool){
+ success = true;
+ order.setSettle(6L);
+ order.setUpdateTime(new Date());
+ orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+ }
+ } else {
+ success = false;
+ order.setSettle(7L);
+ order.setUpdateTime(new Date());
orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
}
} catch (Exception e) {
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
index 73d037d..6e1b12a 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java
@@ -4,6 +4,8 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.ApiLogService;
@@ -19,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.HashMap;
import java.util.Set;
@@ -79,12 +82,20 @@
.doPost();
JSONObject data = JSON.parseObject(response);
Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool=IsSuccess.toString();
+ String bool1=IsSuccess.toString();
//瀹℃牳瀹屾垚鍘熻鍗�4杞�6 6.涓婃姤瀹屾垚
- if(bool.equals("true")){
- success = true;
- order.setSettle(6L);
- orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+ if(bool1.equals("true")){
+ ObjectMapper objectMapper = new ObjectMapper();
+ JsonNode rootNode = objectMapper.readTree(response);
+ boolean bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
+ log.info("瀹℃牳bool:"+bool);
+ //瀹℃牳瀹屾垚鍘熻鍗�4杞�6 6.涓婃姤瀹屾垚
+ if(bool){
+ success = true;
+ order.setSettle(6L);
+ order.setUpdateTime(new Date());
+ orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+ }
}
} catch (Exception e) {
log.error("fail", e);
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
index a05c7ca..20975cc 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java
@@ -4,10 +4,16 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.core.common.DateUtils;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
+import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -19,8 +25,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
-import java.util.HashMap;
-import java.util.Set;
+import java.text.SimpleDateFormat;
+import java.util.*;
/**
* Created by Monkey D. Luffy on 2023.10.21
@@ -43,10 +49,16 @@
@Autowired
private DocTypeService docTypeService;
@Autowired
+ private OrderDetlService orderDetlService;
+ @Autowired
private LoginAuthenticationHandler loginAuthenticationHandler;
@Transactional
public ReturnT<String> start(Order order) {
+ List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
+ if (Cools.isEmpty(orderDetls) || orderDetls.size()==0){
+ return SUCCESS;
+ }
//鐧诲綍閲戣澏r
ReturnT<String> start = loginAuthenticationHandler.start();
DocType docType = docTypeService.selectById(order.getDocType());
@@ -54,12 +66,72 @@
return SUCCESS;
}
KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
-
+ if (kingDeeUtilType.entryId!=2){
+ return SUCCESS;
+ }
+ Date now = new Date();
//鏉′欢鎷兼帴
+ JSONObject jsonObjectFBillTypeID = new JSONObject();
+ JSONObject jsonObjectFPickerId = new JSONObject();
+ if (kingDeeUtilType.pakIn==1){
+ jsonObjectFBillTypeID.put("FNUMBER","QTRKD01_SYS");
+ }else {
+ jsonObjectFBillTypeID.put("FNUMBER","QTCKD01_SYS");
+ jsonObjectFPickerId.put("FStaffNumber","X0103_GLGW074_1");
+ }
+
+ JSONObject jsonObjectFStockOrgId = new JSONObject();
+ jsonObjectFStockOrgId.put("FNUMBER","100");
+
+ JSONObject jsonObjectFOwnerIdHead = new JSONObject();
+ jsonObjectFOwnerIdHead.put("FNUMBER","100");
+
+ JSONObject jsonObjectFDEPTID = new JSONObject();
+ jsonObjectFDEPTID.put("FNUMBER","CX");
+
+ List<JSONObject> jsonObjects = new ArrayList<>();
+
+ for (OrderDetl orderDetl:orderDetls){
+ JSONObject jsonObjectFMATERIALID = new JSONObject();
+ jsonObjectFMATERIALID.put("FNUMBER",orderDetl.getMatnr());
+
+ JSONObject jsonObjectFSTOCKID = new JSONObject();
+ jsonObjectFSTOCKID.put("FNUMBER","CK001");
+
+ JSONObject jsonObjectFLOT = new JSONObject();
+ jsonObjectFLOT.put("FNUMBER",orderDetl.getBatch());
+
+ // 浣跨敤LinkedHashMap鏉ヤ繚鎸佹彃鍏ラ『搴�
+ Map<String, Object> orderedMap = new LinkedHashMap<>();
+
+ // 鎸夌収鏈熸湜鐨勯『搴忔坊鍔犻敭鍊煎
+ orderedMap.put("FMATERIALID", jsonObjectFMATERIALID);
+ orderedMap.put("FSTOCKID", jsonObjectFSTOCKID);
+ orderedMap.put("FLOT", jsonObjectFLOT);
+ orderedMap.put("FQty", orderDetl.getQty()); // 灏�"FQty"鏀惧埌鏈�鍚�
+
+ JSONObject jsonObjectEnd = new JSONObject(orderedMap);
+
+ jsonObjects.add(jsonObjectEnd);
+ }
+
JSONObject jsonObject = new JSONObject();
- jsonObject.put("Numbers",order.getOrderNo());
+ jsonObject.put("FBillTypeID",jsonObjectFBillTypeID);
+ if (kingDeeUtilType.pakIn==0){
+ jsonObject.put("FPickerId",jsonObjectFPickerId);
+ }
+ jsonObject.put("FDate",DateUtils.convert(now, DateUtils.yyyyMMdd_F));
+ jsonObject.put("FStockOrgId",jsonObjectFStockOrgId);
+ jsonObject.put("FOwnerTypeIdHead","BD_OwnerOrg");
+ jsonObject.put("FOwnerIdHead",jsonObjectFOwnerIdHead);
+ jsonObject.put("FDEPTID",jsonObjectFDEPTID);
+ jsonObject.put("FEntity",jsonObjects);
+
+ JSONObject jsonObjectModel = new JSONObject();
+ jsonObjectModel.put("Model",jsonObject);
+
JSONObject jsonObject1 = new JSONObject();
- jsonObject1.put("data", jsonObject);
+ jsonObject1.put("data", jsonObjectModel);
jsonObject1.put("FormId",kingDeeUtilType.correspondingFormId);
String add = jsonObject1.toJSONString();
//涓婃姤
@@ -74,15 +146,29 @@
.setUri(URL)
.setPath(outaddressSave)
.setJson(add)
+ .setHttps(true)
.build()
.doPost();
JSONObject data = JSON.parseObject(response);
Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool=IsSuccess.toString();
+ String bool1=IsSuccess.toString();
//淇濆瓨瀹屾垚鍘熻鍗�8杞�6
- if(bool.equals("true")){
- success = true;
- order.setSettle(6L);
+ if(bool1.equals("true")){
+ ObjectMapper objectMapper = new ObjectMapper();
+ JsonNode rootNode = objectMapper.readTree(response);
+ boolean bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
+ log.info("瀹℃牳bool:"+bool);
+ //鎻愪氦瀹屾垚鍘熻鍗�4杞�6 6.涓婃姤瀹屾垚
+ if(bool){
+ success = true;
+ order.setSettle(6L);
+ order.setUpdateTime(new Date());
+ orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+ }
+ }else {
+ success = false;
+ order.setSettle(7L);
+ order.setUpdateTime(new Date());
orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
}
} catch (Exception e) {
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
index 6223b53..3e0f4a4 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/SubmitOrderSyncHandler.java
@@ -4,6 +4,8 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.ApiLogService;
@@ -19,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Date;
import java.util.HashMap;
import java.util.Set;
@@ -54,7 +57,9 @@
return SUCCESS;
}
KingDeeUtilType kingDeeUtilType = KingDeeUtilType.get(docType.getDocName());
-
+ if (kingDeeUtilType.entryId!=2){
+ return SUCCESS;
+ }
//鏉′欢鎷兼帴
JSONObject jsonObject = new JSONObject();
jsonObject.put("Numbers",order.getOrderNo());
@@ -76,14 +81,22 @@
.setJson(add)
.build()
.doPost();
- JSONObject data = JSON.parseObject(response);
+// JSONObject data = JSON.parseObject(response);
Object IsSuccess = findValueByKey(JSON.parseObject(response), "IsSuccess");
- String bool=IsSuccess.toString();
+ String bool1=IsSuccess.toString();
//鎻愪氦瀹屾垚鍘熻鍗�8杞�6
- if(bool.equals("true")){
- success = true;
- order.setSettle(6L);
- orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+ if(bool1.equals("true")){
+ ObjectMapper objectMapper = new ObjectMapper();
+ JsonNode rootNode = objectMapper.readTree(response);
+ boolean bool = rootNode.get("Result").get("ResponseStatus").get("IsSuccess").asBoolean();
+ log.info("瀹℃牳bool:"+bool);
+ //鎻愪氦瀹屾垚鍘熻鍗�4杞�6 6.涓婃姤瀹屾垚
+ if(bool){
+ success = true;
+ order.setSettle(6L);
+ order.setUpdateTime(new Date());
+ orderService.update(order,new EntityWrapper<Order>().eq("order_no",order.getOrderNo()));
+ }
}
} catch (Exception e) {
log.error("fail", e);
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index b0b3fbb..81a42db 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -23,6 +23,7 @@
private int owner;
private String ownerName;
+ private int beBatch;
private int payment;
@@ -36,6 +37,7 @@
this.batch=detlDto2.getBatch();
this.anfme=detlDto2.getAnfme();
this.ownerName=detlDto2.getOwner();
+ this.beBatch=detlDto2.getBeBatch();
this.payment=0;
}
diff --git a/src/main/java/com/zy/erp/kingdee/entity/param/SaceOrderOtherParam.java b/src/main/java/com/zy/erp/kingdee/entity/param/SaceOrderOtherParam.java
new file mode 100644
index 0000000..c7312b3
--- /dev/null
+++ b/src/main/java/com/zy/erp/kingdee/entity/param/SaceOrderOtherParam.java
@@ -0,0 +1,18 @@
+package com.zy.erp.kingdee.entity.param;
+
+import lombok.Data;
+
+@Data
+public class SaceOrderOtherParam {
+ //璐﹀彿ID
+ private String FMATERIALID;
+
+ //璐﹀彿
+ private String FSTOCKID;
+
+ //瀵嗙爜
+ private String FLOT;
+
+ //
+ private Integer FQty;
+}
diff --git a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
index da03f09..6bf8b04 100644
--- a/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
+++ b/src/main/java/com/zy/erp/kingdee/enums/KingDeeUtilType.java
@@ -2,55 +2,57 @@
public enum KingDeeUtilType {
- SAL_DELIVERYNOTICE(1, "鍙戣揣閫氱煡鍗�-閿�鍞嚭搴撳崟","SAL_DELIVERYNOTICE","FQty","閿�鍞嚭搴撳崟","SAL_OUTSTOCK",0,"DeliveryNotice-Outstock"),
+ SAL_DELIVERYNOTICE(1, "鍙戣揣閫氱煡鍗�-閿�鍞嚭搴撳崟","SAL_DELIVERYNOTICE","FQty","閿�鍞嚭搴撳崟","SAL_OUTSTOCK",0,"DeliveryNotice-Outstock",0),
//绫冲闈掑矝
- STK_OutStockApply30(2, "璇曠敤鍝佸彂璐ч�氱煡鍗�-鍏朵粬鍑哄簱鍗�","","","鍏朵粬鍑哄簱鍗�","STK_MisDelivery",0,""),
+ STK_OutStockApply30(2, "璇曠敤鍝佸彂璐ч�氱煡鍗�-鍏朵粬鍑哄簱鍗�","SAL_DELIVERYNOTICE","","鍏朵粬鍑哄簱鍗�","STK_MisDelivery",0,"731ce15d-c58d-4c21-96f9-d121c0a7b255",0),
/*
* 閫�璐ч�氱煡鍗曡嚦閿�鍞��璐у崟鍗曟嵁鍞竴鏍囪瘑锛氫竴绾э細SalReturnNotice-SalReturnstock 浜岀骇锛歛0ab8e5c-5224-4ba2-b31f-b061e64aa1a2
* */
- SAL_RETURNNOTICE(3, "閫�璐ч�氱煡鍗�-閿�鍞��璐у崟","SAL_RETURNNOTICE","","閿�鍞��璐у崟","SAL_RETURNSTOCK",0,"SalReturnNotice-SalReturnstock"),
+ SAL_RETURNNOTICE(3, "閫�璐ч�氱煡鍗�-閿�鍞��璐у崟","SAL_RETURNNOTICE","","閿�鍞��璐у崟","SAL_RETURNSTOCK",0,"SalReturnNotice-SalReturnstock",0),
/*
* 閲囪喘鏀舵枡鍗曡嚦閲囪喘鍏ュ簱鍗曞敮涓�鏍囪瘑:涓�绾э細PUR_ReceiveBill-STK_InStock 浜岀骇锛歜60e30ca-634c-4f92-b874-db9837496705
* */
- PUR_ReceiveBill(4, "鏀舵枡閫氱煡鍗�-閲囪喘鍏ュ簱鍗�","PUR_ReceiveBill","","閲囪喘鍏ュ簱鍗�","STK_InStock",1,"PUR_ReceiveBill-STK_InStock"),
+ PUR_ReceiveBill(4, "鏀舵枡閫氱煡鍗�-閲囪喘鍏ュ簱鍗�","PUR_ReceiveBill","","閲囪喘鍏ュ簱鍗�","STK_InStock",1,"PUR_ReceiveBill-STK_InStock",0),
/*
* 閫�鏂欑敵璇峰崟鑷抽噰璐��鏂欏崟鍗曟嵁鍞竴鏍囪瘑:PUR_MRAPP-PUR_MRB
* */
- PUR_MRAPP(5, "閫�鏂欑敵璇峰崟-閲囪喘閫�鏂欏崟","PUR_MRAPP","","閲囪喘閫�鏂欏崟","PUR_MRB",1,"PUR_MRAPP-PUR_MRB"),
+ PUR_MRAPP(5, "閫�鏂欑敵璇峰崟-閲囪喘閫�鏂欏崟","PUR_MRAPP","","閲囪喘閫�鏂欏崟","PUR_MRB",1,"PUR_MRAPP-PUR_MRB",0),
/*
* 鐢熶骇鐢ㄦ枡娓呭崟鍒扮敓浜ч鏂欏崟鍞竴鏍囪瘑锛氫竴绾э細PRD_PPBOM2PICKMTRL_NORMAL 浜岀骇锛�3539ff08-0c46-435d-a8cd-b6308b0b57b5
* */
- PRD_PPBOM1(6, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇棰嗘枡鍗�","PRD_PPBOM","","鐢熶骇棰嗘枡鍗�","PRD_PickMtrl",0,"PRD_PPBOM2PICKMTRL_NORMAL"),
+ PRD_PPBOM1(6, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇棰嗘枡鍗�","PRD_PPBOM","","鐢熶骇棰嗘枡鍗�","PRD_PickMtrl",0,"PRD_PPBOM2PICKMTRL_NORMAL",1),
- PRD_PPBOM2(7, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇琛ユ枡鍗�","PRD_PPBOM","","鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl",1,"PRD_PPBOM2FEEDMTRL"),
+ PRD_PPBOM2(7, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇琛ユ枡鍗�","PRD_PPBOM","","鐢熶骇琛ユ枡鍗�","PRD_FeedMtrl",1,"PRD_PPBOM2FEEDMTRL",1),
- PRD_PPBOM3(8, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇閫�鏂欏崟","PRD_PPBOM","","鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl",1,"PRD_PPBOM2RETURNMTRL"),
+ PRD_PPBOM3(8, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇閫�鏂欏崟","PRD_PPBOM","","鐢熶骇閫�鏂欏崟","PRD_ReturnMtrl",1,"PRD_PPBOM2RETURNMTRL",1),
- PRD_MO(9, "鐢熶骇璁㈠崟-鐢熶骇鍏ュ簱鍗�","PRD_MO","","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1,"PRD_MO2INSTOCK"),
+ PRD_MO(9, "鐢熶骇璁㈠崟-鐢熶骇鍏ュ簱鍗�","PRD_MO","","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1,"PRD_MO2INSTOCK",0),
- PRD_MORPT(10, "鐢熶骇姹囨姤鍗�-鐢熶骇鍏ュ簱鍗�","PRD_MORPT","","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1,"PRD_MORPT2INSTOCK"),
+ PRD_MORPT(10, "鐢熶骇姹囨姤鍗�-鐢熶骇鍏ュ簱鍗�","PRD_MORPT","","鐢熶骇鍏ュ簱鍗�","PRD_INSTOCK",1,"PRD_MORPT2INSTOCK",0),
- STK_TRANSFERAPPLY(11, "璋冩嫧鐢宠鍗�-鐩存帴璋冩嫧鍗�","STK_TRANSFERAPPLY","","鐩存帴璋冩嫧鍗�","STK_TransferDirect",0,"StkTransferApphy-StkTransferDirect"),
+ STK_TRANSFERAPPLY1(11, "璋冩嫧鐢宠鍗�1-鐩存帴璋冩嫧鍗�","STK_TRANSFERAPPLY","","鐩存帴璋冩嫧鍗�","STK_TransferDirect",0,"StkTransferApphy-StkTransferDirect",1),
- STK_OutStockApply337(12, "鐮斿彂棰嗘枡鍑哄簱鐢宠鍗�-鐮斿彂棰嗘枡鍑哄簱鍗�","","","鐮斿彂棰嗘枡鍑哄簱鍗�","",0,""),
- STK_MisDelivery13(13, "缁勮鎷嗗嵏鍗�1","STK_ASSEMBLY","","","",0,""),
- STK_MisDelivery14(14, "缁勮鎷嗗嵏鍗�2","STK_ASSEMBLY","","","",0,""),
-
-
-
-
+ STK_OutStockApply337(12, "鐮斿彂棰嗘枡鍑哄簱鐢宠鍗�-鐮斿彂棰嗘枡鍑哄簱鍗�","STK_OUTSTOCKAPPLY","","鐮斿彂棰嗘枡鍑哄簱鍗�","",0,"STK_OutstockApplyTosTK_MisDelivery",0),
+ STK_ASSEMBLY1(13, "缁勮鎷嗗嵏鍗�1","STK_ASSEMBLY","","","",1,"",0),
+ STK_ASSEMBLY2(14, "缁勮鎷嗗嵏鍗�2","STK_ASSEMBLY","","","",0,"",0),
+ SAL_RETURNNOTICE1(15, "鍏跺畠鍏ュ簱鍗�","STK_MISCELLANEOUS","","鍏跺畠鍏ュ簱鍗�","STK_MISCELLANEOUS",1,"",2),
+ SAL_DELIVERYNOTICE2(16, "鍏跺畠鍑哄簱鍗�","STK_MisDelivery","","鍏朵粬鍑哄簱鍗�","STK_MisDelivery",0,"",2),
+ PRD_PPBOM(17, "鐢熶骇鐢ㄦ枡娓呭崟-鐢熶骇鐢ㄦ枡娓呭崟鍙樻洿鍗�","PRD_PPBOM","","鐢熶骇棰嗘枡鍗�","PRD_PPBOMChange",1,"PRD_PPBOM2PPBOMCHANGE",10),
+ STK_TRANSFERAPPLY2(18, "璋冩嫧鐢宠鍗�2-鐩存帴璋冩嫧鍗�","STK_TRANSFERAPPLY","","鐩存帴璋冩嫧鍗�","STK_TransferDirect",0,"StkTransferApphy-StkTransferDirect",1),
+ STK_TRANSFERAPPLY3(19, "璋冩嫧鐢宠鍗�3-鐩存帴璋冩嫧鍗�","STK_TRANSFERAPPLY","","鐩存帴璋冩嫧鍗�","STK_TransferDirect",0,"StkTransferApphy-StkTransferDirect",1),
;
- public Integer id;
- public String desc;//绫诲瀷鍚嶇О
- public String formId;//鍗曟嵁绫诲瀷鍞竴缂栫爜
+ public Integer id;//鍞竴
+ public String desc;//绫诲瀷鍚嶇О 淇濇寔鍞竴
+ public String formId;//鍗曟嵁绫诲瀷
public String anfme;//鍗曟嵁鏁伴噺瀛楁鍚�
public String correspondingName;//鐩爣鍗曟嵁鏁伴噺瀛楁
public String correspondingFormId;//鐩爣formId 闈為粯璁や笅鎺ㄦ椂鍚敤 榛樿涓嬫帹鏃跺惎鐢╮uleId
public Integer pakIn; //鍑哄叆搴撴爣蹇�
public String ruleId;//鍗曟嵁杞崲鍞竴鏍囪瘑 闈為粯璁や笅鎺ㄦ椂鍚敤 榛樿涓嬫帹鏃跺惎鐢╟orrespondingFormId
+ public int entryId;//鍗曟嵁杞崲鍞竴鏍囪瘑 闈為粯璁や笅鎺ㄦ椂鍚敤 榛樿涓嬫帹鏃跺惎鐢╟orrespondingFormId
- KingDeeUtilType(Integer id, String desc,String formId,String anfme,String correspondingName,String correspondingFormId,int pakIn,String ruleId){
+ KingDeeUtilType(Integer id, String desc,String formId,String anfme,String correspondingName,String correspondingFormId,int pakIn,String ruleId,int entryId){
this.id = id;
this.desc = desc;
this.formId = formId;
@@ -59,6 +61,7 @@
this.correspondingFormId = correspondingFormId;
this.pakIn = pakIn; //1鍏ュ簱 0鍑哄簱
this.ruleId = ruleId;
+ this.entryId = entryId;
}
public static KingDeeUtilType get(Short id) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index eb2298c..578a823 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -20,9 +20,6 @@
url: jdbc:sqlserver://127.0.0.1:1433;databasename=mdqdasrs
username: sa
password: sa@123
-# url: jdbc:sqlserver://127.0.0.1:51433;databasename=mdqdasrs
-# username: sa
-# password: Zoneyung@zy56$
mvc:
static-path-pattern: /**
redis:
@@ -68,8 +65,12 @@
InboundOrderSwitch: false
#鐧诲綍鎺ュ彛寮�鍏�
LoginAuthenticationSwitch: true
- #涓婃姤鍗曟嵁寮�鍏� 绫冲鏃犵敤
+ #瀹℃牳鍗曟嵁寮�鍏� 绫冲鏃犵敤
ReviewOrderSwitch: false
+ #淇濆瓨鍗曟嵁寮�鍏�
+ SaveOrderSwitch: true
+ #鎻愪氦鍗曟嵁寮�鍏� 绫冲鏃犵敤
+ SubmitOrderSwitch: false
#涓嬫帹鍗曟嵁寮�鍏�
PushDowmOrderSwitch: true
# 鍦板潃
@@ -81,11 +82,11 @@
inaddress: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.ExecuteBillQuery.common.kdsvc
#鍗曟嵁涓嬫帹鍦板潃
pushDowmAudit: K3cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Push.common.kdsvc
- #缁撴灉涓婃姤锛堜繚瀛橈級鍗曞湴鍧� 绫冲鏃犵敤
+ #缁撴灉涓婃姤锛堜繚瀛橈級鍗曞湴鍧�
outaddressSave: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save.common.kdsvc
#缁撴灉涓婃姤锛堟彁浜わ級鍗曞湴鍧� 绫冲鏃犵敤
outaddressSubmit: K3Cloud/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit.common.kdsvc
- #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧�
+ #缁撴灉涓婃姤锛堝鏍革級鍗曞湴鍧� 绫冲鏃犵敤
outaddressAudit: K3CLOUD/Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit.common.kdsvc
# 鐧诲綍璐﹀彿绠＄悊
login :
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 81c9c88..6a13a72 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -65,7 +65,7 @@
where 1=1
and settle = 4
and status = 1
- order by create_time asc
+ order by update_time asc
</select>
<select id="selectInOrOutOrders" resultMap="BaseResultMap">
SELECT * FROM man_order o left join man_doc_type d on o.doc_type = d.doc_id WHERE d.pakin = #{flag} and o.settle in (1,2)
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index abe7000..90c1539 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -197,6 +197,7 @@
{field: 'payment$', title: '璐х墿鐗瑰緛', width: 160},
// {field: 'batch', title: '鎵瑰彿'},
{field: 'anfme', title: '鏁伴噺'},
+ {field: 'batch', title: '鎵规'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
// {field: 'unit', title: '鍗曚綅'},
@@ -271,6 +272,11 @@
layer.msg('鏁伴噺涓嶈兘灏忎簬宸蹭綔涓氭暟閲�', {icon: 2});
return false;
}
+
+ if (nList[xi].batch === ""){
+ layer.msg('鎵规涓嶈兘涓虹┖', {icon: 2});
+ return false;
+ }
}
for (let xi = 0; xi < nList.length; xi++) {
if (nList[xi].owner <= 0){
@@ -321,6 +327,7 @@
{field: 'specs', title: '瑙勬牸'},
{field: 'weight', title: '閲嶉噺', edit: true},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
+ {field: 'batch', title: '鎵规(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'owner', title: '璐т富缂栧彿', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'payment', title: '璐х墿鐘舵��', style: 'color: blue;font-weight: bold', templet: '#payment'},
// {field: 'payment', title: '璐х墿鐘舵��',align: 'center', templet: '#payment'},
--
Gitblit v1.9.1