From 53ca017d46403700cabc775fc4dbd89f8ebdef78 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期六, 13 十二月 2025 13:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/task/kingdee/handler/SaveOrderSyncHandler.java | 10 +---
src/main/java/com/zy/asrs/entity/LocDetl.java | 9 +++-
src/main/java/com/zy/asrs/controller/OpenController.java | 1
src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java | 2
src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java | 2
src/main/resources/mapper/LocDetlMapper.xml | 8 +++
src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java | 2
src/main/webapp/static/js/common.js | 2
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 18 ++++++++
src/main/java/com/zy/asrs/service/OpenService.java | 1
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 6 +-
11 files changed, 43 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 4fddbba..e369e5e 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -402,6 +402,7 @@
return R.error("鍗曟嵁缂栧彿[order_id]浠� "+sign_arm_sku+" 涓� "+sign_arm_order+" 浣滀负鎷嗗垎鏍囪鎷嗗垎澶辫触锛侊紒锛�");
}
if (param.getArm_no()>4){
+ openService.taskArmOrderResult(param);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index c9ba0f6..43a9228 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -48,11 +48,11 @@
private String maktx;
@ApiModelProperty(value= "瑙勬牸")
- @ExcelProperty("瑙勬牸")
+ //@ExcelProperty("瑙勬牸")
private String specs;
@ApiModelProperty(value= "璐у搧鐗瑰緛")
- @ExcelProperty("璐у搧鐗瑰緛")
+ //@ExcelProperty("璐у搧鐗瑰緛")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -173,18 +173,21 @@
* 澶囩敤1(PO)
*/
@ApiModelProperty(value= "澶囩敤1")//PO
+ @ExcelProperty("瀹㈡埛PO")
private String standby1 = "1";
/**
* 澶囩敤2(UPC)
*/
@ApiModelProperty(value= "澶囩敤2")//UPC
+ @ExcelProperty("鏉＄爜UPC")
private String standby2 = "1";
/**
* 澶囩敤3(SKU)
*/
@ApiModelProperty(value= "澶囩敤3")//SKU
+ @ExcelProperty("瀹㈡埛SKU")
private String standby3 = "1";
/**
@@ -192,6 +195,7 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
+ @ExcelProperty("璐т富")
private String boxType1 = "1";
/**
@@ -206,6 +210,7 @@
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
+ @ExcelProperty("閲囪喘鍗曞彿")
private String boxType3 = "1";
/**
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index 5b9467a..a7429de 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -57,5 +57,6 @@
boolean agvApplicationPassedTheGrating(ArmAgvGratingParam param);
boolean agvApplicationPassedTheGrating(AgvGoTheArnParam param);
boolean agvBindAndBin(String taskNo);
+ boolean taskArmOrderResult(OrderArmEndParam param);
}
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 32ee656..0ae85bc 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -774,7 +774,7 @@
if (Cools.isEmpty(basArmMast)){
throw new CoolException("鏈煡璇㈠埌鐩稿叧鏈烘鑷傛媶鐮佸灈浠诲姟锛侊紒锛�"+ JSON.toJSONString(param));
}
- basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
+// basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),1,3);
basArmMastService.updateArmMastStatus(param.getArm_no(),basArmMast.getSortingLine(),basArmMast.getStaNo(),2,3);
}
@@ -802,6 +802,22 @@
@Override
@Transactional
+ public boolean taskArmOrderResult(OrderArmEndParam param){
+ if(param.getDone_num() == 0){
+ if(basArmMastService.delete(new EntityWrapper<BasArmMast>().eq("arm_no",param.getArm_no())
+ .eq("status",1))){
+ return true;
+ }
+ }
+ if(param.getDone_num() == 1){
+ return true;
+ }
+ log.error("鏈壘鍒板搴斾换鍔�"+ param);
+ return false;
+ }
+
+ @Override
+ @Transactional
public boolean TaskArmWorkOrderSign(OrderArmEndParam param) {
BasArmMastSign basArmMastSignNew = basArmMastSignService.selectOne(
new EntityWrapper<BasArmMastSign>()
diff --git a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
index ae6c6a1..50cd969 100644
--- a/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderToSortLineScheduler.java
@@ -35,7 +35,7 @@
@Autowired
private BasArmMastSignService basArmMastSignService;
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
private void orderToSortLine() {
//鑾峰彇鏈笅鍙戝崟鎹�
List<String> orderNos = orderPakinService.AllStatusSatisfyOrder(0);
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 e82d6a2..0a88985 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
@@ -32,7 +32,7 @@
@Value("${erp.switch.ReviewOrderSwitch}")
private boolean ReviewOrderSwitch;
-// @Scheduled(cron = "0/20 * * * * ?")
+ @Scheduled(cron = "0/20 * * * * ?")
@Async("orderThreadPool")
public void completeAndReport(){
if(!ReviewOrderSwitch){
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 e157e15..f1c8d8e 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
@@ -34,7 +34,7 @@
@Value("${erp.switch.ReviewOrderSwitch}")
private boolean ReviewOrderSwitch;
-// @Scheduled(cron = "0/20 * * * * ?")
+ @Scheduled(cron = "0/20 * * * * ?")
@Async("orderThreadPool")
public void completeAndReport(){
if(!ReviewOrderSwitch){
diff --git a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
index 1eb192a..072e36d 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java
@@ -236,9 +236,9 @@
// 鏇存柊瀛楁
if (!mat.getMaktx().equals(name)) mat.setMaktx(name);
if (mat.getWeight().compareTo(grossweight) != 0) mat.setWeight(grossweight);
- if (mat.getManLength().compareTo(length) != 0) mat.setManLength(length);
- if (mat.getHeight().compareTo(height) != 0) mat.setHeight(height);
- if (mat.getWidth().compareTo(width) != 0) mat.setWidth(width);
+ if (mat.getManLength().compareTo(length) != 0) mat.setManLength(length1);
+ if (mat.getHeight().compareTo(height) != 0) mat.setHeight(height1);
+ if (mat.getWidth().compareTo(width) != 0) mat.setWidth(width1);
if (mat.getCreateTime().compareTo(sdf1.parse(createTime)) != 0)
mat.setCreateTime(sdf1.parse(createTime));
mat.setUpdateTime(modifyTime);
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 25f8bc2..dcf1509 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
@@ -209,14 +209,10 @@
JSONObject resultItem = resultArray.getJSONObject(i);
String billNo = resultItem.getString("number"); // 鑾峰彇杩斿洖鐨勫崟鎹彿
String billId = resultItem.getString("id"); // 鑾峰彇杩斿洖鐨処D
+ order.setNumber(billId);
+ orderService.updateById(order);
+ log.info("璁㈠崟鍙� {} 涓庤繑鍥炵殑鍗曟嵁鍙峰尮閰嶏紝璁剧疆璁㈠崟 ID 涓� {}", order.getOrderNo(), billId);
- // 鍒ゆ柇杩斿洖鐨勫崟鎹彿涓庤鍗曞彿鏄惁涓�鑷�
- if (billNo != null && billNo.equals(order.getOrderNo())) {
- // 濡傛灉涓�鑷达紝璁剧疆璁㈠崟鐨� number
- order.setNumber(billId);
- orderService.updateById(order);
- log.info("璁㈠崟鍙� {} 涓庤繑鍥炵殑鍗曟嵁鍙峰尮閰嶏紝璁剧疆璁㈠崟 ID 涓� {}", order.getOrderNo(), billId);
- }
}
} else {
log.error("鎺ュ彛璋冪敤澶辫触锛屽け璐ョ殑鎿嶄綔鏁伴噺: {}", failCount);
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 241fd4d..e2ab2e7 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -414,9 +414,15 @@
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
, sum(a.anfme) as anfme
+ , a.order_no as orderNo
+ , a.standby1
+ , a.standby2
+ , a.standby3
+ , a.box_type1 as boxType1
+ , a.box_type3 as boxType3
from asr_loc_detl a
where 1=1
- group by a.matnr
+ group by a.matnr,a.order_no,a.box_type3,a.standby1,a.standby2,a.standby3,a.box_type1
</select>
<select id="selectPakoutByRule" resultMap="BaseResultMap">
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index dfb58b7..888d296 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -234,7 +234,7 @@
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
- // ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
+ ,{field: 'boxType3', align: 'center',title: '閲囪喘鍗曞彿', hide: true}
// ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
// ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
// ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
--
Gitblit v1.9.1