From 7102e9faca7b1cc6da94be325831c13d0301d7f6 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 09 二月 2026 14:42:43 +0800
Subject: [PATCH] #
---
src/main/webapp/views/wrkMast/wrkMast.html | 2
src/main/java/com/zy/asrs/entity/OrderDetl.java | 4 +-
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 14 ++++++
src/main/webapp/static/js/wrkMast/wrkMast.js | 2
src/main/java/com/zy/third/task/handler/OrderHandler.java | 2
src/main/webapp/views/wrkMastLog/wrkMastLog.html | 2
src/main/java/com/zy/third/entity/ExdInstockSource.java | 3 -
src/main/webapp/static/js/wrkMastLog/wrkMastLog.js | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 14 ++++---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 27 ++++++++++---
src/main/resources/mapper/asrs/Order1Mapper.xml | 2
src/main/webapp/static/js/orderTablenotxs.js | 2
src/main/resources/mapper/asrs/OrderMapper.xml | 2
src/main/resources/license.lic | 0
src/main/resources/application.yml | 2
src/main/resources/mapper/third/ExdInstockSourceMapper.xml | 1
16 files changed, 54 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index aca72cb..27d5bcb 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -116,9 +116,9 @@
private String color;
/**
- * 鍝佺墝
+ * 浠撳簱
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "浠撳簱")
private String brand;
/**
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 3842a71..c72d229 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -95,6 +95,8 @@
private ExdStockService exdStockService;
@Autowired
private ExdInstockSourceService exdInstockSourceService;
+ @Autowired
+ private Order1Service order1Service;
@Override
@@ -130,9 +132,6 @@
//杩涜鎵瑰彿绛涢�夛紝鎵瑰彿鍙兘鍞竴
Set<String> batchs = new HashSet<>();
List<String> strings = new ArrayList<>();
- long time = new Date().getTime();
- //鐢熶骇鍏ュ簱瀵逛竴鍧ㄧ墿鏂欒繘琛岀粦瀹氥�傚敮涓�鍊�
- String fbillno = param.getBarcode()+"--"+time;
for (CombParam.CombMat mat : param.getCombMats()) {
if (Cools.isEmpty(mat.getBatch())) {
continue;
@@ -197,9 +196,10 @@
waitPakin.setModiUser(userId);
waitPakin.setColor(userId+"");
waitPakin.setModiTime(now);
- //鐢熶骇鍏ュ簱瀵逛竴鍧ㄧ墿鏂欒繘琛岀粦瀹氥�傚敮涓�鍊�
- waitPakin.setOrigin(fbillno);
+
ExdvYanbu barcode1 = exdMaterialMapper.getBacode(detlDto.getBc());
+ //鐢熶骇鍏ュ簱瀵逛竴鍧ㄧ墿鏂欒繘琛岀粦瀹氥�傚敮涓�鍊�
+ waitPakin.setOrigin(param.getBarcode()+"-"+barcode1.getIcmono()+"-"+now.getTime());
String pid="03.98";
if(!Cools.isEmpty(barcode1)&&!Cools.isEmpty(barcode1.getProdinkind())){
pid=barcode1.getProdinkind();
@@ -251,8 +251,10 @@
if (!orderDetlService.increaseWorkQty2(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme(), userId)) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
+
+ Order1 order1 = order1Service.selectByNo(param.getOrderNo());
// 淇敼瀛愬崟璁㈠崟浣滀笟鏁伴噺
- if (!orderDetl1Service.increaseWorkQty2(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme(), userId)) {
+ if (!orderDetl1Service.increaseWorkQty2(order1.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme(), userId)) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
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 19f7567..c5961b2 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -92,7 +92,7 @@
exdInstockTarge.setFtrantype(decType);
exdInstockTarge.setFdate(order.getUpdateTime());
Integer frob = 1;
- if(order.getDocType().intValue()==21||order.getDocType().intValue()==24||order.getDocType().intValue()==2||order.getDocType().intValue()==3){
+ if(order.getDocType().intValue()==21||order.getDocType().intValue()==24){
frob = -1;
}
exdInstockTarge.setFrob(frob);
@@ -103,7 +103,10 @@
exdInstockTarge.setWritor("WMS");
exdInstockTarge.setStatus(0);
exdInstockTarge.setProdinkind(orderDetl.getItemNum());
- exdInstockTargetService.insert(exdInstockTarge);
+ if(exdInstockTargetService.insert(exdInstockTarge)){
+ log.info("鍏ュ簱璁㈠崟瀹屾垚鎻掑叆涓棿琛紝鏁版嵁={}",exdInstockTarge);
+ break;
+ }
}
if (!orderService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
@@ -119,11 +122,19 @@
exdOutstockTarget.setFbillno(orderDetl.getOrderNo());
if (order.getDocType() == 42) {
exdOutstockTarget.setFtrantype(41);
- } else {
+ } else if(order.getDocType() == 3){
+ exdOutstockTarget.setFtrantype(1);
+ }else if(order.getDocType() == 25){
+ exdOutstockTarget.setFtrantype(24);
+ }else{
exdOutstockTarget.setFtrantype(order.getDocType().intValue());
}
exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
- exdOutstockTarget.setFrob(order.getDocType().intValue()==2? -1:1);
+ Integer frob = 1;
+ if (order.getDocType().intValue()==2 || order.getDocType().intValue()==3){
+ frob = -1;
+ }
+ exdOutstockTarget.setFrob(frob);
//鎿嶄綔鐢ㄦ埛
User id = userService.selectOne(new EntityWrapper<User>().eq("id", orderDetl.getUpdateBy()));
exdOutstockTarget.setFuserid(Integer.valueOf(id.getEmail()));
@@ -131,8 +142,10 @@
exdOutstockTarget.setWritor("WMS");
exdOutstockTarget.setStatus(0);
exdOutstockTarget.setProdinkind(orderDetl.getItemNum());
- exdOutstockTargetService.insert(exdOutstockTarget);
-
+ if(exdOutstockTargetService.insert(exdOutstockTarget)){
+ log.info("鍑哄簱璁㈠崟瀹屾垚鎻掑叆涓棿琛紝鏁版嵁={}",exdOutstockTarget);
+ break;
+ }
}
if (!orderService.updateSettle(order.getId(), 6L, null)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
@@ -234,7 +247,7 @@
//浠撳簱ID
Integer Fdcstockid = 19382;
if(!Cools.isEmpty(bacode.getProdinkind())){
- ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fname", orderDetl.getBrand()));
+ ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fnumber", bacode.getProdinkind()));
Fdcstockid = Integer.valueOf(fname.getId());
}
exdOutstockTarget.setFdcstockid(Fdcstockid);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index ff57b73..725825e 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -24,6 +24,7 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
/**
@@ -540,8 +541,19 @@
private void write(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
ExdInstockTarget exdInstockTarge;
int i = 1;
+ //璁℃暟
+ HashMap<String,Integer> hashMap = new HashMap<>();
for (WrkDetl wrkDetl : wrkDetls) {
if (Cools.isEmpty(wrkDetl.getOrderNo()) && !Cools.isEmpty(wrkDetl.getInspect()) && wrkDetl.getInspect() == 1) {
+ if (Cools.isEmpty(hashMap)){
+ hashMap.put(wrkDetl.getOrigin(),1);
+ }else{
+ if(hashMap.containsKey(wrkDetl.getOrigin())){
+ hashMap.put(wrkDetl.getOrigin(),hashMap.get(wrkDetl.getOrigin())+1);
+ }else{
+ hashMap.put(wrkDetl.getOrigin(),1);
+ }
+ }
ExdvYanbu bacode = exdMaterialMapper.getBacode(wrkDetl.getThreeCode());
if (bacode == null) {
log.info("楠屽竷鏁版嵁娌℃湁锛寋}", wrkDetl.getThreeCode());
@@ -559,7 +571,7 @@
exdInstockTarge.setFbillerid(Integer.valueOf(id.getEmail()));
exdInstockTarge.setFfmanagerid(17938);
exdInstockTarge.setFsmanagerid(17938);
- exdInstockTarge.setFentryid(i);
+ exdInstockTarge.setFentryid(hashMap.get(wrkDetl.getOrigin()));
//鐗╂枡ID
Mat mat = matServiceImpl.selectByMatnr(wrkDetl.getMatnr());
exdInstockTarge.setFitemid(Integer.valueOf(mat.getUuid()));
diff --git a/src/main/java/com/zy/third/entity/ExdInstockSource.java b/src/main/java/com/zy/third/entity/ExdInstockSource.java
index 9786d5a..78ae86b 100644
--- a/src/main/java/com/zy/third/entity/ExdInstockSource.java
+++ b/src/main/java/com/zy/third/entity/ExdInstockSource.java
@@ -177,8 +177,7 @@
*
*/
private String readormsg;
-
- private String ProdInKind;
+ private String prodinkind;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/zy/third/task/handler/OrderHandler.java b/src/main/java/com/zy/third/task/handler/OrderHandler.java
index 7eed914..cfcd8b7 100644
--- a/src/main/java/com/zy/third/task/handler/OrderHandler.java
+++ b/src/main/java/com/zy/third/task/handler/OrderHandler.java
@@ -117,7 +117,7 @@
//鐢熸垚瀛愬崟涓昏〃
Order1 order1 = new Order1(
- String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
+ String.valueOf(order.getUuid()), // 缂栧彿[闈炵┖]
fbillno, // 璁㈠崟缂栧彿
DateUtils.convert(exdInstockSource.get(0).getFdate()), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 9b39719..3cd8bf8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,7 +11,7 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
#jdbc-url: jdbc:sqlserver://172.17.3.20:1433;databasename=ycawdasrs
- jdbc-url: jdbc:sqlserver://127.0.0.1:1433;databasename=ycawdasrs
+ jdbc-url: jdbc:sqlserver://172.17.3.18:1433;databasename=ycawdasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index ce6bb35..ac76aff 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/resources/mapper/asrs/Order1Mapper.xml b/src/main/resources/mapper/asrs/Order1Mapper.xml
index b34e578..110b76c 100644
--- a/src/main/resources/mapper/asrs/Order1Mapper.xml
+++ b/src/main/resources/mapper/asrs/Order1Mapper.xml
@@ -54,7 +54,7 @@
</update>
<select id="selectComplete" resultMap="BaseResultMap">
- select top 5 *
+ select *
from man_order1
where 1=1
and settle = 4
diff --git a/src/main/resources/mapper/asrs/OrderMapper.xml b/src/main/resources/mapper/asrs/OrderMapper.xml
index db8816d..68c4cb2 100644
--- a/src/main/resources/mapper/asrs/OrderMapper.xml
+++ b/src/main/resources/mapper/asrs/OrderMapper.xml
@@ -54,7 +54,7 @@
</update>
<select id="selectComplete" resultMap="BaseResultMap">
- select top 5 *
+ select *
from man_order
where 1=1
and settle = 4
diff --git a/src/main/resources/mapper/third/ExdInstockSourceMapper.xml b/src/main/resources/mapper/third/ExdInstockSourceMapper.xml
index 8d77a0f..65c51dd 100644
--- a/src/main/resources/mapper/third/ExdInstockSourceMapper.xml
+++ b/src/main/resources/mapper/third/ExdInstockSourceMapper.xml
@@ -37,6 +37,7 @@
<result property="reador" column="Reador" />
<result property="writormsg" column="WritorMsg" />
<result property="readormsg" column="ReadorMsg" />
+ <result property="prodinkind" column="ProdInKind" />
</resultMap>
<sql id="Base_Column_List">
diff --git a/src/main/webapp/static/js/orderTablenotxs.js b/src/main/webapp/static/js/orderTablenotxs.js
index 33036c1..3f18fa8 100644
--- a/src/main/webapp/static/js/orderTablenotxs.js
+++ b/src/main/webapp/static/js/orderTablenotxs.js
@@ -64,7 +64,7 @@
});
/* 琛ㄦ牸鎼滅储 */
- form.on('submit(originTableSearch)', function (data) {
+ form.on('submit(originTablenotxsSearch)', function (data) {
insTb.reload({where: data.field});
return false;
});
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index d486202..55c54ba 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -30,7 +30,7 @@
,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
- ,{field: 'pauseMk', align: 'center',title: '璁㈠崟鍙�'}
+ ,{field: 'packed', align: 'center',title: '璁㈠崟鍙�'}
,{field: 'barcode', align: 'center',title: '鏉＄爜'}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
diff --git a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
index bb9c539..5258394 100644
--- a/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
+++ b/src/main/webapp/static/js/wrkMastLog/wrkMastLog.js
@@ -33,6 +33,7 @@
,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
+ ,{field: 'packed', align: 'center',title: '璁㈠崟鍙�'}
// ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
// var html = "<input value='picking' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
// if(row.picking === 'Y'){html += " checked ";}
@@ -60,7 +61,6 @@
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
// ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
,{field: 'barcode', align: 'center',title: '鏉＄爜'}
- ,{field: 'pauseMk', align: 'center',title: '璁㈠崟鍙�'}
// ,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
// var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
// if(row.fullPlt === 'Y'){html += " checked ";}
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index e25e81e..d3b4116 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -75,7 +75,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="pause_mk" placeholder="璁㈠崟鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="packed" placeholder="璁㈠崟鍙�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/wrkMastLog/wrkMastLog.html b/src/main/webapp/views/wrkMastLog/wrkMastLog.html
index ba2eccb..f5e7a09 100644
--- a/src/main/webapp/views/wrkMastLog/wrkMastLog.html
+++ b/src/main/webapp/views/wrkMastLog/wrkMastLog.html
@@ -59,7 +59,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="pause_mk" placeholder="璁㈠崟鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="packed" placeholder="璁㈠崟鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1