From d3c7820992ccfb3296ec031a7c019a4300347b83 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 28 十月 2025 15:30:25 +0800
Subject: [PATCH] 完善erp对接2.0
---
src/main/java/com/zy/third/service/ExdMaterialService.java | 1
src/main/java/com/zy/third/mapper/ExdMaterialMapper.java | 2
src/main/resources/mapper/asrs/LocDetlMapper.xml | 2
src/main/webapp/static/js/order/OrderDetlStockOut.js | 1
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 29 +++++--
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 1
src/main/resources/mapper/third/ExdMaterialMapper.xml | 20 +++-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 36 ++++----
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 76 ++++++++++++-------
src/main/java/com/zy/asrs/controller/MobileController.java | 25 ++++-
src/main/resources/application.yml | 12 +-
11 files changed, 132 insertions(+), 73 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 5eff674..6520030 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -21,6 +21,7 @@
import com.zy.common.web.BaseController;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
+import com.zy.third.entity.ExdMaterial;
import com.zy.third.entity.ExdvYanbu;
import com.zy.third.mapper.ExdMaterialMapper;
import lombok.extern.slf4j.Slf4j;
@@ -467,7 +468,7 @@
}
//绌烘墭鐩樼紦鍐插尯 灏忥細E8 澶э細E9
String rStaNo = "E8";
- if (barcode.substring(0, 1).equals("9")) {
+
String type = "ZONE"; //鍖哄煙
if (barcode.substring(0, 1).equals("9")) {
rStaNo = "E9";
@@ -575,10 +576,8 @@
if (bool) {
return R.ok();
} else {
- return R.error();
+ return R.error(msg);
}
- }
- return R.error();
}
/**
@@ -879,7 +878,10 @@
} else if (sourceStaNo.equals("R02")) {
rcsParam.put("carrierDir", "90");
- } else {
+ } else if(sourceStaNo.substring(0,1).equals("C")){
+ rcsParam.put("carrierDir", "90");
+ }
+ else{
rcsParam.put("carrierDir", "180");
}
@@ -950,13 +952,18 @@
}
R r = R.ok();
+ //闃叉鏈夋湭涓嬫灦鐨勭墿鏂欑洿鎺ヨ繘琛岀┖鏉垮洖搴撴垨鑰呮嫞鏂欏洖搴�
+ WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", staNo).in("wrk_sts", 33));
+ if (!Cools.isEmpty(wrkMast1)) {
+ return R.error("璇ユ墭鐩�="+wrkMast1.getBarcode()+",娌℃湁涓嬫灦锛岃涓嬫灦鍚庡啀鍥炲簱锛侊紒锛�");
+ }
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", staNo).in("io_type", 103, 105, 107));
if (wrkMast == null) {
r = FillEmptyPalletsStack(sourceStaNo, staNo);
} else {
if (wrkMast.getWrkSts() > 30) {
- return R.error("璇ユ墭鐩�={},娌℃湁涓嬫灦锛岃涓嬫灦鍚庡啀鍥炲簱锛侊紒锛�");
+ return R.error("璇ユ墭鐩�="+wrkMast.getBarcode()+",娌℃湁涓嬫灦锛岃涓嬫灦鍚庡啀鍥炲簱锛侊紒锛�");
}
List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).in("io_type", 101, 103, 105, 107).lt("wrk_sts", 33));
if (!Cools.isEmpty(wrkMasts)) {
@@ -1006,9 +1013,15 @@
return R.error("鎵规瀵瑰簲鐨勯獙甯冩暟鎹笉瀛樺湪");
}
Mat mat = matService.selectByMatnr(barcode1.getItemnumber());
+ if(Cools.isEmpty(mat.getUuid())) {
+ ExdMaterial fnumber = exdMaterialMapper.getID(barcode1.getItemnumber());
+ mat.setUuid(fnumber.getId());
+ }
mat.setAnfme(barcode1.getQty());
mat.setBc(barcode);
mat.setBatch(barcode1.getBatchno());
+ matService.updateById(mat);
+
return R.ok(mat);
}
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 32ff83f..07edb2b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -109,26 +109,26 @@
Date now = new Date();
//杩涜鎵瑰彿绛涢�夛紝鎵瑰彿鍙兘鍞竴
-// Set<String> batchs = new HashSet<>();
-// List<String> strings = new ArrayList<>();
+ Set<String> batchs = new HashSet<>();
+ List<String> strings = new ArrayList<>();
-// for (CombParam.CombMat mat : param.getCombMats()) {
-// if (Cools.isEmpty(mat.getBatch())) {
-// continue;
-// }
-// batchs.add(mat.getBatch());
-// strings.add(mat.getBatch());
-// WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("batch", mat.getBatch()));
-// WrkDetl batch = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", mat.getBatch()));
-// LocDetl batch1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", mat.getBatch()));
-// if (!Cools.isEmpty(batch) || !Cools.isEmpty(batch1) || !Cools.isEmpty(waitPakin)) {
-// throw new CoolException("璇ョ墿鏂欐壒鍙�" + mat.getBatch() + "宸插湪鍏ュ簱閫氱煡妗ｃ�佷换鍔℃槑缁嗗拰搴撳瓨涓瓨鍦�");
-// }
-// }
-// if (batchs.size() < strings.size()) {
-// throw new CoolException("鏈夐噸澶嶇殑鐗╂枡鎵瑰彿");
-// }
+ for (CombParam.CombMat mat : param.getCombMats()) {
+ if (Cools.isEmpty(mat.getBatch())) {
+ continue;
+ }
+ batchs.add(mat.getBatch());
+ strings.add(mat.getBatch());
+ WaitPakin waitPakin = waitPakinService.selectOne(new EntityWrapper<WaitPakin>().eq("batch", mat.getBatch()));
+ WrkDetl batch = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("batch", mat.getBatch()));
+ LocDetl batch1 = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", mat.getBatch()));
+ if (!Cools.isEmpty(batch) || !Cools.isEmpty(batch1) || !Cools.isEmpty(waitPakin)) {
+ throw new CoolException("璇ョ墿鏂欐壒鍙�" + mat.getBatch() + "宸插湪鍏ュ簱閫氱煡妗ｃ�佷换鍔℃槑缁嗗拰搴撳瓨涓瓨鍦�");
+ }
+ }
+ if (batchs.size() < strings.size()) {
+ throw new CoolException("鏈夐噸澶嶇殑鐗╂枡鎵瑰彿");
+ }
int i = 1;
// 鏃犲崟缁勬墭
if (Cools.isEmpty(param.getOrderNo())) {
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index a47d507..5790bd9 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -487,6 +487,7 @@
order1.setUpdateTime(new Date());
order1.setSettle(2L);
order1Service.insert(order1);
+ order2=order1;
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
for (LocDto locDto : taskDto.getLocDtos()) {
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 fdf3095..7abf1e0 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,5 +1,6 @@
package com.zy.asrs.task.handler;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
@@ -8,12 +9,14 @@
import com.zy.asrs.service.impl.OrderDetl1ServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.third.entity.ExdInstockTarget;
-import com.zy.third.entity.ExdOutstockTarget;
-import com.zy.third.entity.ExdvYanbu;
+import com.zy.system.entity.User;
+import com.zy.system.service.UserService;
+import com.zy.third.entity.*;
import com.zy.third.mapper.ExdMaterialMapper;
import com.zy.third.service.ExdInstockTargetService;
+import com.zy.third.service.ExdOutstockSourceService;
import com.zy.third.service.ExdOutstockTargetService;
+import com.zy.third.service.ExdStockService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -53,6 +56,12 @@
private ExdMaterialMapper exdMaterialMapper;
@Autowired
private Order1Service order1Service;
+ @Autowired
+ private ExdOutstockSourceService exdOutstockSourceService;
+ @Autowired
+ private UserService userService;
+ @Autowired
+ private ExdStockService exdStockService;
@Transactional
public ReturnT<String> start(Order order) {
@@ -125,9 +134,9 @@
for (OrderDetl1 orderDetl : orderDetls) {
- ExdvYanbu bacode = exdMaterialMapper.getBacode(orderDetl.getThreeCode());
+ ExdvYanbu bacode = exdMaterialMapper.getBacode(orderDetl.getBatch());
//鑾峰彇涓昏〃鏄庣粏
- OrderDetl orderDetl1 = orderDetlService.selectItem(orderDetl.getOrderNo(), orderDetl.getMatnr(), null);
+ OrderDetl orderDetl1 = orderDetlService.selectItem(orderDetl.getOrderNo().split("-")[0], orderDetl.getMatnr(), null);
//涓婃姤鏁伴噺
BigDecimal anfme = new BigDecimal(orderDetl1.getAnfme());
BigDecimal Units = new BigDecimal((Cools.isEmpty(orderDetl1.getUnits()) ? 0.0 : orderDetl1.getUnits()));
@@ -147,12 +156,23 @@
//鍗曞彿 = erp璁㈠崟鍙�+鐗╂枡缂栧彿+涓婃姤娆℃暟
exdOutstockTarget.setFbillno(order.getOrderNo());
+ //鍗曟嵁绫诲瀷
+ exdOutstockTarget.setFtrantype(21);
+
+ //鍗曟嵁鏃ユ湡
+ exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
+ //绾㈣摑瀛�
+ exdOutstockTarget.setFrob(1);
+ //鎿嶄綔鐢ㄦ埛
+ User id = userService.selectOne(new EntityWrapper<User>().eq("id", orderDetl.getCreateBy()));
+ exdOutstockTarget.setFuserid(Integer.valueOf(id.getEmail()));
+
//閮ㄩ棬ID
exdOutstockTarget.setFdeptid(7502);
//渚涘簲鍟�/瀹㈡埛ID
exdOutstockTarget.setFsupplyid(0);
//鍒跺崟鐢ㄦ埛ID
- exdOutstockTarget.setFbillerid(Math.toIntExact(orderDetl.getUpdateBy()));
+ exdOutstockTarget.setFbillerid(Integer.valueOf(id.getEmail()));
//缁嗚〃ID
Integer c = Integer.valueOf(order.getOrderNo().split("-")[1]);
exdOutstockTarget.setFentryid(c);
@@ -170,35 +190,35 @@
//鍗曚綅ID
exdOutstockTarget.setFunitid(0);
//婧愬崟鍙�
- exdOutstockTarget.setFsourcebillno(orderDetl.getOrderNo());
- //婧愬崟缁嗚〃ID 鏆傚畾
- exdOutstockTarget.setFsourceentryid(0);
- //婧愬崟鍐呯爜 鏆傚畾
- exdOutstockTarget.setFsourceinterid(0);
+ exdOutstockTarget.setFsourcebillno(orderDetl.getOrderNo().split("-")[0]);
+ ExdOutstockSource exdOutstockSource = exdOutstockSourceService.selectOne(new EntityWrapper<ExdOutstockSource>()
+ .eq("FBillNo", orderDetl.getOrderNo().split("-")[0])
+ .eq("FItemID", mat.getUuid()));
+ //婧愬崟缁嗚〃ID
+ exdOutstockTarget.setFsourceentryid(exdOutstockSource.getFentryid());
+ //婧愬崟鍐呯爜
+ exdOutstockTarget.setFsourceinterid(exdOutstockSource.getFinterid());
//婧愬崟鍗曟嵁绫诲瀷
- exdOutstockTarget.setFsourcetrantype(0);
+ exdOutstockTarget.setFsourcetrantype(81);
//搴撲綅ID
exdOutstockTarget.setFdcspid(0);
- //浠撳簱ID 鏆傚畾
- exdOutstockTarget.setFdcstockid(0);
+ //浠撳簱ID
+ Integer Fdcstockid = 19382;
+ if(!Cools.isEmpty(bacode.getProdinkind())){
+ ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fname", bacode.getProdinkind()));
+ Fdcstockid = Integer.valueOf(fname.getId());
+ }
+ exdOutstockTarget.setFdcstockid(Fdcstockid);
//閿�鍞鍗曞崟鍙� 鏆傚畾
- exdOutstockTarget.setForderbillno(orderDetl.getOrderNo());
+ exdOutstockTarget.setForderbillno(exdOutstockSource.getForderbillno());
//閿�鍞鍗曠粏琛↖D 鏆傚畾
- exdOutstockTarget.setForderentryid(0);
+ exdOutstockTarget.setForderentryid(exdOutstockSource.getForderentryid());
//閿�鍞鍗曞唴鐮� 鏆傚畾
- exdOutstockTarget.setForderinterid(0);
+ exdOutstockTarget.setForderinterid(exdOutstockSource.getForderinterid());
//璁″垝妯″紡
exdOutstockTarget.setFplanmode(0);
- //鍗曟嵁绫诲瀷
- exdOutstockTarget.setFtrantype(21);
- //鍗曟嵁鏃ユ湡
- exdOutstockTarget.setFdate(DateUtils.convert(order.getOrderTime()));
- //绾㈣摑瀛�
- exdOutstockTarget.setFrob(orderDetl.getBeBatch());
- //鎿嶄綔鐢ㄦ埛
- exdOutstockTarget.setFuserid(Integer.getInteger(orderDetl.getColor()));
exdOutstockTarget.setBarcode(orderDetl.getBatch());
exdOutstockTarget.setGross(BigDecimal.valueOf(bacode.getGross()));
@@ -225,10 +245,10 @@
}
}
for (OrderDetl1 orderDetl : orderDetls) {
- OrderDetl orderDetl1 = orderDetlService.selectItem(orderDetl.getOrderNo(), orderDetl.getMatnr(), null);
- orderDetl1.setUnits(orderDetl.getAnfme() + (Cools.isEmpty(orderDetl.getUnits()) ? 0.0 : orderDetl.getUnits()));
+ OrderDetl orderDetl1 = orderDetlService.selectItem(orderDetl.getOrderNo().split("-")[0], orderDetl.getMatnr(), null);
+ orderDetl1.setUnits(orderDetl.getAnfme() + (Cools.isEmpty(orderDetl1.getUnits()) ? 0.0 : orderDetl1.getUnits()));
orderDetl1.setUpdateTime(new Date());
- orderDetl1Service.updateById(orderDetl);
+ orderDetlService.updateById(orderDetl1);
}
return SUCCESS;
}
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 d0c7df7..39619b7 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -2,12 +2,15 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.MatServiceImpl;
import com.zy.asrs.service.impl.OrderDetl1ServiceImpl;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.system.entity.User;
+import com.zy.system.service.impl.UserServiceImpl;
import com.zy.third.entity.ExdInstockTarget;
import com.zy.third.entity.ExdStock;
import com.zy.third.entity.ExdvYanbu;
@@ -55,6 +58,8 @@
private MatServiceImpl matServiceImpl;
@Autowired
private OrderDetl1ServiceImpl orderDetl1Service;
+ @Autowired
+ private UserServiceImpl userService;
@Transactional
public ReturnT<String> start(WrkMast wrkMast) {
@@ -516,7 +521,7 @@
private void write(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
ExdInstockTarget exdInstockTarge;
- int i = -1;
+ int i = 1;
for (WrkDetl wrkDetl : wrkDetls) {
if (Cools.isEmpty(wrkDetl.getOrderNo()) && !Cools.isEmpty(wrkDetl.getInspect()) && wrkDetl.getInspect() == 1) {
ExdvYanbu bacode = exdMaterialMapper.getBacode(wrkDetl.getThreeCode());
@@ -525,16 +530,17 @@
return;
}
exdInstockTarge = new ExdInstockTarget();
- exdInstockTarge.setFtrantype(21);
+ exdInstockTarge.setFtrantype(2);
exdInstockTarge.setFdate(new Date());
exdInstockTarge.setFrob(1);
exdInstockTarge.setFdeptid(7502);
//渚涘簲鍟�/瀹㈡埛ID
exdInstockTarge.setFsupplyid(0);
//wms鎿嶄綔鍛�
- exdInstockTarge.setFbillerid(Integer.valueOf(wrkDetl.getColor()));
- exdInstockTarge.setFfmanagerid(Integer.valueOf(wrkDetl.getColor()));
- exdInstockTarge.setFsmanagerid(Integer.valueOf(wrkDetl.getColor()));
+ User id = userService.selectOne(new EntityWrapper<User>().eq("id", wrkDetl.getColor()));
+ exdInstockTarge.setFbillerid(Integer.valueOf(id.getEmail()));
+ exdInstockTarge.setFfmanagerid(17938);
+ exdInstockTarge.setFsmanagerid(17938);
exdInstockTarge.setFentryid(i);
//鐗╂枡ID
Mat mat = matServiceImpl.selectByMatnr(wrkDetl.getMatnr());
@@ -554,8 +560,13 @@
//搴撲綅ID
exdInstockTarge.setFdcspid(0);
//浠撳簱ID
- ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fname", wrkDetl.getBrand()));
- exdInstockTarge.setFdcstockid(Integer.valueOf(fname.getId()));
+ Integer Fdcstockid = 19382;
+ if(!Cools.isEmpty(bacode.getProdinkind())){
+ ExdStock fname = exdStockService.selectOne(new EntityWrapper<ExdStock>().eq("Fname", bacode.getProdinkind()));
+ Fdcstockid = Integer.valueOf(fname.getId());
+ }
+
+ exdInstockTarge.setFdcstockid(Integer.valueOf(Fdcstockid));
//exdInstockTarge.setFdcspid(wrkMast.getLocNo());
@@ -571,7 +582,9 @@
//浠撳簱
exdInstockTarge.setProdinkind(bacode.getProdinkind());
//exdInstockTarge.setProdInKind("鐗归噰搴�");
- exdInstockTargetService.insert(exdInstockTarge);
+ if(!exdInstockTargetService.insert(exdInstockTarge)){
+ throw new CoolException("楠屽竷鍏ュ簱瀹屾垚鎻掑叆鍏ュ簱琛ㄥけ璐�");
+ }
i++;
}
}
diff --git a/src/main/java/com/zy/third/mapper/ExdMaterialMapper.java b/src/main/java/com/zy/third/mapper/ExdMaterialMapper.java
index acb9522..9bac260 100644
--- a/src/main/java/com/zy/third/mapper/ExdMaterialMapper.java
+++ b/src/main/java/com/zy/third/mapper/ExdMaterialMapper.java
@@ -16,7 +16,7 @@
public interface ExdMaterialMapper extends BaseMapper<ExdMaterial> {
ExdvYanbu getBacode(@Param("barcode") String barcode);
-
+ ExdMaterial getID(@Param("itemnumber") String itemnumber);
List<ExdMaterial> listAll();
}
diff --git a/src/main/java/com/zy/third/service/ExdMaterialService.java b/src/main/java/com/zy/third/service/ExdMaterialService.java
index 5a21a4c..736389c 100644
--- a/src/main/java/com/zy/third/service/ExdMaterialService.java
+++ b/src/main/java/com/zy/third/service/ExdMaterialService.java
@@ -10,4 +10,5 @@
*/
public interface ExdMaterialService extends IService<ExdMaterial> {
+
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cedb8f5..9b39719 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -33,12 +33,12 @@
# password: root
#driver-class-name: com.mysql.cj.jdbc.Driver
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# jdbc-url: jdbc:sqlserver://192.168.3.148:1433;databasename=wms_middle
-# username: wms
-# password: wms@aunde
- jdbc-url: jdbc:sqlserver://127.0.0.1:1433;databasename=ycawdasrs
- username: sa
- password: sa@123
+ jdbc-url: jdbc:sqlserver://192.168.3.148:1433;databasename=wms_middle
+ username: wms
+ password: wms@aunde
+# jdbc-url: jdbc:sqlserver://127.0.0.1:1433;databasename=ycawdasrs
+# username: sa
+# password: sa@123
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
diff --git a/src/main/resources/mapper/asrs/LocDetlMapper.xml b/src/main/resources/mapper/asrs/LocDetlMapper.xml
index e3a03e4..b6f8dd5 100644
--- a/src/main/resources/mapper/asrs/LocDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/LocDetlMapper.xml
@@ -89,7 +89,7 @@
and a.loc_no like '%' + #{loc_no} + '%'
</if>
<if test="matnr!=null and matnr!='' ">
- and a.matnr like '%' + #{matnr} + '%'
+ and a.matnr = #{matnr}
</if>
<if test="zpallet!=null and zpallet!='' ">
and a.zpallet like '%' + #{zpallet} + '%'
diff --git a/src/main/resources/mapper/third/ExdMaterialMapper.xml b/src/main/resources/mapper/third/ExdMaterialMapper.xml
index a7ca4a4..aa72b98 100644
--- a/src/main/resources/mapper/third/ExdMaterialMapper.xml
+++ b/src/main/resources/mapper/third/ExdMaterialMapper.xml
@@ -30,13 +30,23 @@
</select>
<select id="getBacode" resultType="com.zy.third.entity.ExdvYanbu" parameterType="string">
--- SELECT top 1 *
--- FROM [Textile].[trade].[TianfuQcResult]
--- where Barcode = #{barcode}
- SELECT top 1 *
+ SELECT top 1 *
+ FROM [Textile].[trade].[TianfuQcResult]
+ where Barcode = #{barcode}
+<!-- SELECT top 1 *
FROM TianfuQcResult
- where Barcode = #{barcode}
+ where Barcode = #{barcode}-->
</select>
+ <select id="getID" resultType="com.zy.third.entity.ExdMaterial" parameterType="string">
+ select top 1 *
+ from Exd_Material
+ where Fnumber = #{itemnumber}
+ <!-- SELECT top 1 *
+ FROM TianfuQcResult
+ where Barcode = #{barcode}-->
+
+ </select>
+
</mapper>
diff --git a/src/main/webapp/static/js/order/OrderDetlStockOut.js b/src/main/webapp/static/js/order/OrderDetlStockOut.js
index 9e18e47..2b4dbb8 100644
--- a/src/main/webapp/static/js/order/OrderDetlStockOut.js
+++ b/src/main/webapp/static/js/order/OrderDetlStockOut.js
@@ -329,6 +329,7 @@
layer.close(layerIndex);
layer.msg(res.msg, {icon: 1});
tableIns.reload({where: null});
+ tableIns.reload({data: null});
tableInss.reload({where: null, page: {curr: 1}});
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
--
Gitblit v1.9.1