From 780461e27d87b769b6f9649a9a7fa532d880a2e9 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期三, 07 一月 2026 14:54:37 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 2
src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java | 2
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java | 3 +
src/main/webapp/static/js/locDetlStatis/locDetlStatis.js | 8 ++--
src/main/resources/mapper/LocDetlMapper.xml | 6 +-
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 4 +-
src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java | 1
src/main/java/com/zy/asrs/task/kingdee/handler/ReviewOrderSyncHandler.java | 4 +-
src/main/webapp/static/js/common.js | 2
src/main/java/com/zy/asrs/controller/OutController.java | 7 ---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 6 ++-
src/main/java/com/zy/asrs/task/kingdee/handler/InboundOrderHandler.java | 20 ++++++---
13 files changed, 36 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OutController.java b/src/main/java/com/zy/asrs/controller/OutController.java
index 1e20214..7fb77b9 100644
--- a/src/main/java/com/zy/asrs/controller/OutController.java
+++ b/src/main/java/com/zy/asrs/controller/OutController.java
@@ -176,12 +176,8 @@
continue;
}
List<LocDetl> locDetls = null;
- if(orderDetl.getStandby1().equals("123")){
- locDetls = locDetlService.queryStockAll123(null, exist,orderDetl.getMatnr(), "1");
+ locDetls = locDetlService.queryStockAll123(null, exist,orderDetl.getMatnr(), orderDetl.getBoxType3());
- }else{
- locDetls = locDetlService.queryStockAll7(null, exist,orderDetl.getMatnr(), orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(),orderDetl.getBoxType1(),orderDetl.getBoxType2(),orderDetl.getBoxType3());
- }
for (LocDetl locDetl : locDetls) {
if (issued > 0) {
LocDto locDto = new LocDto(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getMaktx(), locDetl.getBatch(), orderDetl.getOrderNo(),
@@ -192,7 +188,6 @@
List<Integer> staNos = staDescService.queryOutStaNosByLocNo(locDetl.getLocNo(), issued >= locDetl.getAnfme() ? 101 : 103);
locDto.setStaNos(staNos);
locDto.setBrand(orderDetl.getBrand());
-
locDto.setStandby1(orderDetl.getStandby1());
locDto.setStandby2(orderDetl.getStandby2());
locDto.setStandby3(orderDetl.getStandby3());
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java b/src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java
index 8ec6c8e..3dc3509 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvLocListDetlParam.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity.param;
+import com.zy.asrs.entity.BasAgvLocDetl;
import com.zy.asrs.entity.LocDetl;
import lombok.Data;
@@ -9,5 +10,5 @@
public class AgvLocListDetlParam {
private String locNo; //搴撲綅鍙�
private String locSys; //搴撲綅鐘舵��
- private List<LocDetl> agvDetlList; //鏄庣粏
+ private List<BasAgvLocDetl> agvDetlList; //鏄庣粏
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index afb3421..2a70a61 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -81,7 +81,7 @@
@Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2);
List<LocDetl> queryStockAll7(@Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("matnr")String matnr, @Param("standby1")String standby1,@Param("standby2")String standby2,
@Param("standby3")String standby3,@Param("boxType1")String boxType1,@Param("boxType2")String boxType2,@Param("boxType3")String boxType3);
- List<LocDetl> queryStockAll123(@Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("matnr")String matnr, @Param("standby1")String standby);
+ List<LocDetl> queryStockAll123(@Param("orderNo")String orderNo, @Param("locNos") Set<String> locNos, @Param("matnr")String matnr, @Param("boxType3")String boxType3);
Double queryStockAnfme(String matnr, String batch);
List<LocDetl> queryStockMatnr(@Param("matnr")String matnr);
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index fb3ed10..9b9de10 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -72,7 +72,7 @@
// List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2, String boxType3);
List<LocDetl> queryStockAll(String orderNo, Set<String> locNos,String matnr, String batch, String brand, String standby1, String standby2, String standby3, String boxType1, String boxType2);
List<LocDetl> queryStockAll7(String orderNo, Set<String> locNos,String matnr, String standby1, String standby2, String standby3, String boxType1, String boxType2,String boxType3);
- List<LocDetl> queryStockAll123(String orderNo, Set<String> locNos,String matnr, String standby1);
+ List<LocDetl> queryStockAll123(String orderNo, Set<String> locNos,String matnr, String boxType3);
Double queryStockAnfme(String matnr, String batch);
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index 718541a..08986ec 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -131,8 +131,8 @@
}
@Override
- public List<LocDetl> queryStockAll123(String orderNo, Set<String> locNos,String matnr, String standby1) {
- return this.baseMapper.queryStockAll123(orderNo,locNos, matnr,standby1);
+ public List<LocDetl> queryStockAll123(String orderNo, Set<String> locNos,String matnr, String boxType3) {
+ return this.baseMapper.queryStockAll123(orderNo,locNos, matnr,boxType3);
}
@Override
public Double queryStockAnfme(String matnr, String batch) {
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 5ff9f70..abe1f5b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -66,6 +66,8 @@
@Autowired
private BasArmMastService basArmMastService;
@Autowired
+ private BasAgvLocDetlService basAgvLocDetlService;
+ @Autowired
private BasArmMastSignService basArmMastSignService;
@Autowired
private BasAgvMastService basAgvMastService;
@@ -969,8 +971,8 @@
}
private AgvLocListDetlParam buildAgvLocListDetlParam(String locNo, String locSts) {
- List<LocDetl> detlList = locDetlService.selectList(
- new EntityWrapper<LocDetl>().eq("loc_no", locNo)
+ List<BasAgvLocDetl> detlList = basAgvLocDetlService.selectList(
+ new EntityWrapper<BasAgvLocDetl>().eq("loc_no", locNo)
);
AgvLocListDetlParam dto = new AgvLocListDetlParam();
diff --git a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
index 185baf5..e448f59 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java
@@ -19,6 +19,7 @@
private boolean InboundOrderSwitch;
// 姣�15鍒嗛挓鍚屾涓�娆＄墿鏂欐。妗�,闃叉妗ｆ浣嶅悓姝ュ崟鎹厛鑾峰彇
@Scheduled(cron = "0 */15 * * * ?")
+// @Scheduled(cron = "0/5 * * * * ?")
void syncMaterialData() {
if (!InboundOrderSwitch) {
return;
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 ca4c2ac..6e4d79e 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -57,7 +57,7 @@
}else if( order.getDocType() == 21){ //瀵煎叆璁㈠崟鍑哄簱锛堥鏂欙級
order.setSettle(8L);
orderService.updateById(order);
- }else if(order.getPayType() == 1 || order.getSalesman() != null){
+ }else if((order.getPayType() != null && order.getPayType() == 1) && order.getSalesman() != null){
Order order1 = orderService.selectByNo(order.getSalesman());
if(orderDetlPakinService.morpt(order.getSalesman(),order.getOrderNo())){
order.setSettle(11L); //yu/cheng/dan/deng/dai/chu/ku/dan
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 713a851..f537323 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
@@ -298,6 +298,7 @@
String matnr = jsonObjectNew.get("number").toString();
String name = jsonObjectNew.get("name").toString();
String createTime = jsonObjectNew.get("createtime").toString();
+ String memo = jsonObjectNew.get("eap7_textfield1").toString();
Double height = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield9");
Double width = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield8");
Double length = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield7");
@@ -335,6 +336,7 @@
if (mat.getUpdateTime().compareTo(modifyTime) != 0) {
// 鏇存柊瀛楁
if (!mat.getMaktx().equals(name)) mat.setMaktx(name);
+ if (!mat.getMemo().equals(memo)) mat.setMemo(memo);
if (mat.getWeight().compareTo(grossweight) != 0) mat.setWeight(grossweight);
if (mat.getUnits().compareTo(netweight) != 0) mat.setUnits(netweight);
if (mat.getSafeQty().compareTo(unit) != 0) mat.setSafeQty(unit);
@@ -724,6 +726,7 @@
for (int k = 0; k < billEntryArray.size(); k++) {
JSONObject entry = billEntryArray.getJSONObject(k);
String matnr = entry.getString("material_number"); //鐗╂枡缂栫爜锛屽唴閮⊿KU
+ Double qty = entry.getDouble("qty");
Double anfme = entry.getDouble("eap7_decimalfield");//绠辨暟
Double totalNumItems = entry.getDouble("eap7_decimalfield1");//鎬讳欢鏁�
Double totalVolume = entry.getDouble("eap7_decimalfield2");//鎬讳綋绉�
@@ -737,7 +740,7 @@
Long seq = entry.getLong("seq"); //鍒嗗綍琛屽彿
// String suppCode = entry.getString("supplier_number");
String suppCode = null;
- if (anfme == null || anfme == 0) {
+ if (qty == null || qty == 0) {
callApiLogSaveOrder(order, kingDeeUtilType,
"鍗曟嵁鏁伴噺寮傚父锛�" + matnr, false);
continue;
@@ -754,7 +757,7 @@
"妗ｆ绠辨暟閲忓紓甯革細" + matnr, false);
continue;
}
- Double erpAnfme = anfme*mat.getSafeQty();
+ Double anfmeBox = qty/mat.getSafeQty();
// ========= 鏄庣粏鍘婚噸 =========
List<OrderDetl> orderDetls =
orderDetlService.selectByOrderId(order.getId());
@@ -773,8 +776,8 @@
orderDetl.sync(mat);
orderDetl.setThreeCode(detlId);
orderDetl.setLineNumber(seq);
- orderDetl.setAnfme(anfme);
- orderDetl.setErpAnfme(erpAnfme);
+ orderDetl.setAnfme(anfmeBox != anfme?anfme : anfmeBox);
+ orderDetl.setErpAnfme(qty);
orderDetl.setOrderId(order.getId());
orderDetl.setOrderNo(order.getOrderNo());
orderDetl.setSupp(supp);
@@ -1640,9 +1643,9 @@
orderDetl.setSupp(supp);
orderDetl.setSuppCode(suppCode);
orderDetl.setSku(matnr);
- orderDetl.setStandby1(s1);
- orderDetl.setStandby2(s2);
- orderDetl.setStandby3(s3);
+ orderDetl.setStandby1(s1 != null? s1:"1");
+ orderDetl.setStandby2(s2 != null? s2:"1");
+ orderDetl.setStandby3(s3 != null? s3:"1");
orderDetl.setBoxType1(owner);
orderDetl.setBoxType2(ownerUuid);
orderDetl.setBoxType3(pOrderNo);
@@ -1772,6 +1775,7 @@
String matnr = jsonObjectNew.get("number").toString();
String name = jsonObjectNew.get("name").toString();
String createTime = jsonObjectNew.get("createtime").toString();
+ String memo = jsonObjectNew.get("eap7_textfield1").toString();
Double height = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield9");
Double width = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield8");
Double length = getDecimalFieldAsDouble(jsonObjectNew, "eap7_decimalfield7");
@@ -1794,6 +1798,7 @@
mat.setManLength(length1);
mat.setHeight(height1);
mat.setWidth(width1);
+ mat.setMemo(memo);
mat.setCreateTime(sdf1.parse(createTime));
mat.setUpdateTime(modifyTime);
mat.setStatus(1);
@@ -1809,6 +1814,7 @@
if (mat.getUpdateTime().compareTo(modifyTime) != 0) {
// 鏇存柊瀛楁
if (!mat.getMaktx().equals(name)) mat.setMaktx(name);
+ if (!mat.getMemo().equals(memo)) mat.setMemo(memo);
if (mat.getWeight().compareTo(grossweight) != 0) mat.setWeight(grossweight);
if (mat.getUnits().compareTo(netweight) != 0) mat.setUnits(netweight);
if (mat.getSafeQty().compareTo(unit) != 0) mat.setSafeQty(unit);
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 7570676..ef4ef37 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
@@ -238,11 +238,11 @@
}
}
}
- if(order.getDocType() == 16L){
+ if((order.getDocType() == 16L || order.getDocType() == 24L || order.getDocType() == 3) && order.getCstmrName().equals("鍜屽緱绉戞妧")){
order.setDocType(23L);
order.setSettle(4L);//杞负鍑哄簱鍗曟嵁涓婃姤
}else{
- if(order.getDocType() == 23L || order.getDocType() == 24L){
+ if(order.getDocType() == 23L){
Order order1 = orderService.selectOne(new EntityWrapper<Order>().eq("salesman",order.getOrderNo()));
orderService.updateOrderStatus4(order1.getOrderNo());
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index c9ff0bc..91f37f4 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -54,11 +54,11 @@
</resultMap>
<sql id="batchSeq123">
<choose>
- <when test="standby1 != null and standby1 != ''">
- and d.standby1 = #{standby1}
+ <when test="boxType3 != null and boxType3 != ''">
+ and a.box_type3 = #{boxType3}
</when>
<otherwise>
- and (d.standby1 IS NULL OR d.standby1 = '')
+ and (a.box_type3 IS NULL OR a.box_type3 = '')
</otherwise>
</choose>
</sql>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index f94bd5e..e9a4aba 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -228,7 +228,7 @@
var detlCols = [
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true,hide:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
// ,{field: 'batch', align: 'center',title: '璐у搧鐗瑰緛', sort:true,hide:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
diff --git a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
index 5d4a8dd..eaa774c 100644
--- a/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
+++ b/src/main/webapp/static/js/locDetlStatis/locDetlStatis.js
@@ -6,7 +6,7 @@
arrRemove(detlCols, "field", "anfme")
arrRemove(detlCols, "field", "zpallet")
arrRemove(detlCols, "field", "orderNo")
- arrRemove(detlCols, "field", "memo")
+ // arrRemove(detlCols, "field", "memo")
cols.push.apply(cols, detlCols);
// cols.push({field: 'anfme', align: 'center',title: '鏁伴噺', style: 'font-weight: bold'}
// )
@@ -126,14 +126,14 @@
success: function (res) {
layer.closeAll();
if (res.code === 200 && res.data && res.data.length > 0) {
- var titles = ['搴撳瓨鏁伴噺', '鍟嗗搧缂栧彿', '鍟嗗搧鍚嶇О', '閲囪喘鍗曞彿', '鏉＄爜UPC', '鍗曠姣涢噸(kg)', '瀹㈡埛PO'];
- var fieldKeys = ['anfme', 'matnr', 'maktx', 'boxType3', 'standby2', 'units', 'standby1'];
+ var titles = ['搴撳瓨鏁伴噺', '鍟嗗搧缂栧彿', '澶囨敞', '閲囪喘鍗曞彿', '鏉＄爜UPC', '鍗曠姣涢噸(kg)', '瀹㈡埛PO'];
+ var fieldKeys = ['anfme', 'matnr', 'memo', 'boxType3', 'standby2', 'units', 'standby1'];
var exportData = res.data.map(function(item) {
return [
item.anfme || '',
item.matnr || '',
- item.maktx || '', // 濡傛灉 maktx 涓虹┖鍙粯璁�
+ item.memo || '', // 濡傛灉 maktx 涓虹┖鍙粯璁�
item.boxType3 || '',
item.standby2 || '',
item.units || '',
--
Gitblit v1.9.1