From 5e098d04e6521bf72a71d0e70724580eca881fab Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 12 十一月 2025 13:40:59 +0800
Subject: [PATCH] *
---
src/main/resources/mapper/OrderMapper.xml | 2
src/main/java/com/zy/asrs/service/WrkMastService.java | 1
src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java | 195 +++++++++++++++++++++++++++
src/main/java/com/zy/asrs/entity/DocType.java | 25 +++
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 5
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 1
src/main/resources/mapper/WrkMastMapper.xml | 24 ++-
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 57 ++++++++
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 98 +++++++++++++
9 files changed, 396 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/DocType.java b/src/main/java/com/zy/asrs/entity/DocType.java
index 3cd4c70..89e2cca 100644
--- a/src/main/java/com/zy/asrs/entity/DocType.java
+++ b/src/main/java/com/zy/asrs/entity/DocType.java
@@ -189,5 +189,30 @@
}
+ public String getDocName$(String outOrIn){
+ if (Cools.isEmpty(this.docName)){
+ if (outOrIn.equals("out")){
+ return "鎴愬搧鍑哄簱";
+ } else {
+ return "鎴愬搧鍏ュ簱";
+ }
+ }else {
+ switch (this.docName){
+ case "鎷嗗寘瑁呮鍑哄簱":
+ case "閫�璐у叆搴�":
+ return this.docName;
+ case "缁勮揣鍗�":
+ return "鎴愬搧鍑哄簱";
+ default:
+ if (outOrIn.equals("out")){
+ return "鎴愬搧鍑哄簱";
+ } else {
+ return "鎴愬搧鍏ュ簱";
+ }
+ }
+ }
+
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java b/src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java
new file mode 100644
index 0000000..dcbc175
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/param/OrderMesXGHYParam.java
@@ -0,0 +1,195 @@
+package com.zy.asrs.entity.param;
+
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.WrkDetl;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/*
+ * Created by Monkey D. Luffy on 2025.10.28
+ * */
+@Data
+public class OrderMesXGHYParam {
+ private String barcode ; //鎵樼洏鏉＄爜锛堝緪宸ユ椂闂存埑锛� = snowflakeIdWorker.nextId() zpallet
+ private int palletizingNo; //鐮佸灈浣嶇紪鍙凤紙浣嶇疆锛�
+ private List<Box> matList; //鏈ㄧ闆嗗悎
+
+
+ @Data
+ public static class Box {
+ private String packageGroupNo; //鍖呰缁勫彿锛堝緪宸ユ病鏈夛紝鍙湁绠卞彿鍗峰彿涓�瀵逛竴锛� //null
+ private String outOrIn; //out 鍑猴紱in鍏ワ紱
+
+ /*
+ * 鎺ュ彛1=銆嬩笉鍚堟牸鍝佸嚭搴撲簩妤硷細 涓嶅悎鏍煎搧鍑哄簱
+ * 鎺ュ彛2=銆嬫甯稿嚭搴撲簩妤硷細 鎷嗗寘瑁呮鍑哄簱
+ * 2妤兼満姊拌噦鍏ュ簱锛氭垚鍝佸叆搴�
+ * 1妤奸��搴擄細閫�璐у叆搴�
+ * 鐩樼偣鍑哄簱锛氱洏鐐瑰嚭搴�
+ * 鐩樼偣鍏ュ簱锛氱洏鐐瑰叆搴�
+ * 1妤兼墜鍔ㄥ嚭搴擄細鎴愬搧鍑哄簱
+ * 缁勮揣鍗曞嚭锛氭垚鍝佸嚭搴�
+ * */
+ private String stockType; //鍗曟嵁绫诲瀷
+
+ private String boxNo; //绠卞彿
+ private String boxPos; //浣嶇疆 1 2 3 origin 鏈ㄧ浣嶇疆
+ private String boxType; //鏈ㄧ绫诲瀷 鏈ㄧ绫诲瀷 brand brand$
+ private String wideInWidth; // 4.5渭m脳588mm matnr 涓殑 4.5
+ private String thickness; //4.5渭m脳588mm matnr 涓殑 588
+
+ private String rollType = "绾歌酱"; //鏈ㄧ绫诲瀷 brand brand$
+
+ private List<Roll> rolls; //鍗烽泦鍚�
+
+ @Data
+ public static class Roll {
+ private String boxNo; //绠卞彿 batch
+ private String rollNo; //鍗峰彿 model
+ private String specs; //瑙勬牸 4.5渭m脳588mm matnr
+ private String length; //闀垮害 price
+ private String splices; //鎺ュご specs
+ private String netWeight; //鍑�閲� weight
+ private String grossWeight; //姣涢噸 volume
+ private String fqTime = DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss_F); //
+ private String orderSerialNumber; //WMS娴佹按鍙� ERP鏃犻渶鐞嗕細
+ private String orderSerialNumberMsg = "orderSerialNumber涓篧MS娴佹按鍙�===ERP鏃犻渶鐞嗕細"; //
+
+ public Roll() {
+
+ }
+
+ public Roll(WrkDetl sampleWrkDetl) {
+ this.boxNo = sampleWrkDetl.getBatch();
+ this.rollNo = sampleWrkDetl.getModel();
+ this.specs = sampleWrkDetl.getMatnr();
+ this.length = sampleWrkDetl.getPrice().toString();
+ this.splices = sampleWrkDetl.getSpecs();
+ this.netWeight = sampleWrkDetl.getWeight().toString();
+ this.grossWeight = sampleWrkDetl.getVolume().toString();
+ this.orderSerialNumber = sampleWrkDetl.getOrderNo();
+ }
+
+ @Override
+ public String toString() {
+ return String.format(
+ "\tRoll(rollNo=%s, specs=%s, length=%s, splices=%s, netWeight=%s, grossWeight=%s, fqTime=%s, boxNo=%s, orderSerialNumber=%s, orderSerialNumberMsg=%s)\n",
+ rollNo, specs, length, splices, netWeight, grossWeight, fqTime, boxNo, orderSerialNumber, orderSerialNumberMsg
+ );
+ }
+
+ }
+
+
+ @Override
+ public String toString() {
+ return String.format(
+ "Box(boxNo=%s, boxPos=%s, packageGroupNo=%s, outOrIn=%s, stockType=%s, boxType=%s, rollType=%s, wideInWidth=%s, thickness=%s, rolls=\n%s)",
+ boxNo, boxPos, packageGroupNo, outOrIn, stockType, boxType, rollType, wideInWidth, thickness, rolls.toString()
+ );
+ }
+
+ }
+
+ public OrderMesXGHYParam() {
+
+ }
+
+ public OrderMesXGHYParam(List<WrkDetl> wrkDetls,String outOrIn) {
+ // 鎸塨atch瀛楁鍒嗙粍锛屾瘡涓猙atch瀵瑰簲涓�涓狟ox
+ Map<String, List<WrkDetl>> batchGroup = wrkDetls.stream()
+ .collect(Collectors.groupingBy(WrkDetl::getBatch));
+
+ List<OrderMesXGHYParam.Box> boxList = new ArrayList<>();
+
+ // 澶勭悊姣忎釜batch鍒嗙粍
+ for (Map.Entry<String, List<WrkDetl>> entry : batchGroup.entrySet()) {
+ String batch = entry.getKey();
+ List<WrkDetl> batchWrkDetls = entry.getValue();
+
+ // 鍒涘缓Box瀵硅薄
+ OrderMesXGHYParam.Box box = new OrderMesXGHYParam.Box();
+ box.setBoxNo(batch); // batch瀵瑰簲boxNo
+ box.setOutOrIn(outOrIn); // batch瀵瑰簲boxNo
+
+ // 鎸塵odel瀛楁鍒嗙粍锛屾瘡涓猰odel瀵瑰簲涓�涓猺oll
+ Map<String, List<WrkDetl>> modelGroup = batchWrkDetls.stream()
+ .collect(Collectors.groupingBy(WrkDetl::getModel));
+
+ List<OrderMesXGHYParam.Box.Roll> rollList = new ArrayList<>();
+ String wideInWidth = null;
+ String thickness = null;
+ String boxPos = null;
+ String boxType = null;
+ String stockType = null; //鍗曟嵁绫诲瀷
+ String packageGroupNo = null; //鍖呰缁勫彿锛堝緪宸ユ病鏈夛紝鍙湁绠卞彿鍗峰彿涓�瀵逛竴锛� //null
+
+ // 澶勭悊姣忎釜model鍒嗙粍
+ for (Map.Entry<String, List<WrkDetl>> modelEntry : modelGroup.entrySet()) {
+ List<WrkDetl> modelWrkDetls = modelEntry.getValue();
+
+ // 鍙栫涓�涓猈rkDetl鏉ュ垱寤簉oll锛堝洜涓哄悓涓�涓猰odel鐨剅oll淇℃伅搴旇鐩稿悓锛�
+ WrkDetl sampleWrkDetl = modelWrkDetls.get(0);
+ String matnr = sampleWrkDetl.getMatnr();
+ // 浣跨敤姝ｅ垯琛ㄨ揪寮忔彁鍙栨暟瀛楅儴鍒�
+ // 鍏堟寜"渭m脳"鍒嗗壊锛屽啀鎸�"mm"鍒嗗壊
+ String[] firstSplit = matnr.split("渭m脳");
+ if (firstSplit.length == 2) {
+ wideInWidth = firstSplit[0]; // 5.2
+ String[] secondSplit = firstSplit[1].split("mm");
+ if (secondSplit.length > 0) {
+ thickness = secondSplit[0]; // 834.1
+ }
+ }
+ boxPos = sampleWrkDetl.getOrigin();
+ boxType = sampleWrkDetl.getBrand$();
+ stockType = sampleWrkDetl.getManu();
+ packageGroupNo = sampleWrkDetl.getDeadTime();
+ OrderMesXGHYParam.Box.Roll roll = new OrderMesXGHYParam.Box.Roll(sampleWrkDetl);
+
+ rollList.add(roll);
+ }
+ box.setWideInWidth(wideInWidth);
+ box.setThickness(thickness);
+ box.setBoxPos(boxPos);
+ box.setBoxType(boxType);
+ box.setStockType(stockType);
+ box.setPackageGroupNo(packageGroupNo);
+
+ box.setRolls(rollList);
+ boxList.add(box);
+ }
+
+ // 璁剧疆鍒颁富瀵硅薄涓�
+ this.matList = boxList;
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("OrderMesXGHYParam(\n");
+ sb.append(" barcode=").append(barcode).append(",\n");
+ sb.append(" palletizingNo=").append(palletizingNo).append(",\n");
+ sb.append(" matList=[\n");
+
+ if (matList != null) {
+ for (int i = 0; i < matList.size(); i++) {
+ sb.append("\t").append(matList.get(i).toString().replace("\n", "\n\t"));
+ if (i < matList.size() - 1) {
+ sb.append(",\n");
+ } else {
+ sb.append("\n");
+ }
+ }
+ }
+
+ sb.append(" ]\n");
+ sb.append(")");
+ return sb.toString();
+ }
+}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 2b52b39..ba43a60 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -18,6 +18,7 @@
List<WrkMast> selectToBeCompleteData202();
List<WrkMast> selectToBeHistoryData();
+ List<WrkMast> selectToBeHistoryDataV1();
List<WrkMast> selectToBeHistoryData2();
int orderAddPri(@Param("orderNo") String orderNo);
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 845a916..7dfa9de 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -13,6 +13,7 @@
List<WrkMast> selectToBeCompleteData202();
List<WrkMast> selectToBeHistoryData();
+ List<WrkMast> selectToBeHistoryDataV1();
List<WrkMast> selectToBeHistoryData2();
WrkMast selectByBarcode(String barcode);
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index c1f47dd..2663f91 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -36,6 +36,11 @@
}
@Override
+ public List<WrkMast> selectToBeHistoryDataV1() {
+ return this.baseMapper.selectToBeHistoryDataV1();
+ }
+
+ @Override
public List<WrkMast> selectToBeHistoryData2() {
return this.baseMapper.selectToBeHistoryData2();
}
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 7c65a7c..81b5e02 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,9 +1,15 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.WrkDetl;
+import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.WrkDetlService;
+import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
import com.zy.common.entity.Parameter;
@@ -13,6 +19,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.Date;
import java.util.List;
/**
@@ -28,6 +35,10 @@
private OrderService orderService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private WrkDetlService wrkDetlService;
+ @Autowired
+ private WrkMastService wrkMastService;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog(){
@@ -39,7 +50,7 @@
}
// @Scheduled(cron = "0/5 * * * * ? ")
- @Async("orderThreadPool")
+// @Async("orderThreadPool")
public void completeAndReport(){
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
@@ -58,4 +69,48 @@
}
}
+ @Scheduled(cron = "0 0 * * * *")
+ public void completeAndReport2(){
+ List<Order> orders = orderService.selectComplete();
+ for (Order order : orders) {
+ try{
+ if (!Cools.isEmpty(order.getOrderNo())) {
+ int selectCount = wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("order_no", order.getOrderNo()));
+ if (selectCount > 0) {
+ // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
+ orderService.updateSettle(order.getId(), 6L, null);
+ continue;
+ }
+ }
+ order.setCreateTime(new Date());
+ orderService.updateById(order);
+ }catch (Exception e){
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ log.error("璁㈠崟"+order+"澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
+ }
+ }
+ }
+
+ @Scheduled(cron = "0/5 * * * * ? ")
+ private void executeV1(){
+ List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryDataV1();
+ if (Cools.isEmpty(wrkMasts) || wrkMasts.size()==0) {
+ return;
+ }
+ for (WrkMast wrkMast : wrkMasts) {
+ try{
+ ReturnT<String> result = orderSyncHandler.startV1(wrkMast);
+ if (!result.isSuccess()) {
+ log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
+ } else {
+ wrkMast.setLogMk("Y");
+ wrkMastService.updateById(wrkMast);
+ }
+ }catch (Exception e){
+ log.error("宸ヤ綔妗workNo={}]鍘嗗彶妗ｅ鐞嗗け璐�", wrkMast.getWrkNo());
+ log.error("澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
+ }
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 43b50b1..77f29c6 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -2,16 +2,18 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
+import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.OrderMesXGHYParam;
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.service.impl.WrkDetlServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.constant.MesConstant;
@@ -24,6 +26,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -43,6 +46,10 @@
private ApiLogService apiLogService;
@Autowired
private DocTypeService docTypeService;
+ @Autowired
+ private WrkDetlServiceImpl wrkDetlService;
+ @Autowired
+ private SnowflakeIdWorker snowflakeIdWorker;
@Transactional
public ReturnT<String> start(Order order) {
@@ -157,4 +164,89 @@
return SUCCESS;
}
+ @Transactional
+ public ReturnT<String> startV1(WrkMast wrkMast) {
+// List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+ List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<>());
+ if (wrkDetls.isEmpty()) {
+ return SUCCESS;
+ }
+ String packageGroupNo; //鍖呰缁勫彿锛堝緪宸ユ病鏈夛紝鍙湁绠卞彿鍗峰彿涓�瀵逛竴锛� //null
+ String outOrIn; //out 鍑猴紱in鍏ワ紱
+ /*
+ * 鎺ュ彛1=銆嬩笉鍚堟牸鍝佸嚭搴撲簩妤硷細 涓嶅悎鏍煎搧鍑哄簱
+ * 鐩樼偣鍑哄簱锛氱洏鐐瑰嚭搴�
+ * 鐩樼偣鍏ュ簱锛氱洏鐐瑰叆搴�
+ *
+ *
+ * 鎺ュ彛2=銆嬫甯稿嚭搴撲簩妤硷細 鎷嗗寘瑁呮鍑哄簱
+ * 1妤奸��搴擄細閫�璐у叆搴�
+ *
+ * 缁勮揣鍗曞嚭锛氭垚鍝佸嚭搴�
+ *
+ * 2妤兼満姊拌噦鍏ュ簱锛氭垚鍝佸叆搴�
+ * 1妤兼墜鍔ㄥ嚭搴擄細鎴愬搧鍑哄簱
+ * */
+ String stockType = null; //鍗曟嵁绫诲瀷
+// and (wrk_sts=5 or wrk_sts=15 or (wrk_sts!=5 and (io_type = 53 or io_type = 57)) or io_type = 107)
+ if (wrkMast.getIoType()==1){
+ outOrIn = "in";
+ } else if (wrkMast.getIoType()==101 || wrkMast.getIoType()==53) {
+ outOrIn = "out";
+ } else if (wrkMast.getIoType()==107) {
+ outOrIn = "out";
+ stockType = "鐩樼偣鍑哄簱";
+ } else if (wrkMast.getIoType()==57) {
+ outOrIn = "in";
+ stockType = "鐩樼偣鍏ュ簱";
+ } else {
+ return SUCCESS;
+ }
+ for (WrkDetl wrkDetl : wrkDetls) {
+ if (outOrIn.equals("out")){
+ if (!Cools.isEmpty(stockType) && stockType.equals("鐩樼偣鍑哄簱")){
+ wrkDetl.setManu("鐩樼偣鍑哄簱");
+ } else if (!Cools.isEmpty(wrkDetl.getOrderNo()) && !wrkDetl.getOrderNo().equals("涓嶅悎鏍煎搧鍑哄簱")){
+ Order order = orderService.selectByNo(wrkDetl.getOrderNo());
+ if (!Cools.isEmpty(order)){
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (!Cools.isEmpty(docType)) {
+ if (docType.getDocName().equals("缁勮揣鍗�")){
+// packageGroupNo = order.getItemName();
+ wrkDetl.setDeadTime(order.getItemName());
+ }
+ wrkDetl.setManu(docType.getDocName$());
+ } else {
+ wrkDetl.setManu("鎴愬搧鍑哄簱");
+ }
+ } else {
+ wrkDetl.setManu("鎴愬搧鍑哄簱");
+ }
+ } else if (wrkDetl.getOrderNo().equals("涓嶅悎鏍煎搧鍑哄簱")){
+ wrkDetl.setManu("涓嶅悎鏍煎搧鍑哄簱");
+ }
+ } else {
+ wrkDetl.setManu("鎴愬搧鍏ュ簱");
+ if (!Cools.isEmpty(stockType) && stockType.equals("鐩樼偣鍏ュ簱")){
+ wrkDetl.setManu("鐩樼偣鍏ュ簱");
+ } else if (!Cools.isEmpty(wrkDetl.getOrderNo())){
+ Order order = orderService.selectByNo(wrkDetl.getOrderNo());
+ if (!Cools.isEmpty(order)){
+ DocType docType = docTypeService.selectById(order.getDocType());
+ if (!Cools.isEmpty(docType)) {
+ wrkDetl.setManu(docType.getDocName$());
+ }
+ }
+ }
+ }
+ }
+
+ OrderMesXGHYParam orderMesXGHYParam = new OrderMesXGHYParam(wrkDetls,outOrIn);
+ orderMesXGHYParam.setBarcode(String.valueOf(snowflakeIdWorker.nextId()));
+ orderMesXGHYParam.setPalletizingNo(1);
+
+ System.out.println(orderMesXGHYParam.toString());
+ return SUCCESS;
+ }
+
}
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index b8e3703..c0030d2 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -54,7 +54,7 @@
</update>
<select id="selectComplete" resultMap="BaseResultMap">
- select top 5 *
+ select top 10 *
from man_order
where 1=1
and settle = 4
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 7875a50..9ec8669 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -72,13 +72,23 @@
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from asr_wrk_mast
- where wrk_sts=5
- or wrk_sts=44
- or wrk_sts=64
- or (wrk_sts=57 and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
+ where 1=1
+ and (wrk_sts=5
+ or wrk_sts=44
+ or wrk_sts=64
+ or (wrk_sts=57 and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and dateadd(mi,15,crn_end_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
+ or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp)))
+ and log_mk = 'Y'
+ order by io_time,wrk_no asc
+ </select>
+
+ <select id="selectToBeHistoryDataV1" resultMap="BaseResultMap">
+ select * from asr_wrk_mast
+ where 1=1
+ and (wrk_sts=5 or wrk_sts=15 or io_type = 107 or (wrk_sts!=5 and (io_type = 53 or io_type = 57)))
+ and log_mk != 'Y'
order by io_time,wrk_no asc
</select>
--
Gitblit v1.9.1