From 21fdb6d630bd74e262e0c5d40f9478cc844eb556 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 24 九月 2025 15:31:24 +0800
Subject: [PATCH] 对接
---
src/main/resources/mapper/third/ExdUserMapper.xml | 28
src/main/java/com/zy/asrs/entity/param/CombParam.java | 3
src/main/resources/mapper/third/ExdCustomerMapper.xml | 2
src/main/java/com/zy/third/mapper/ExdOutstockTargetMapper.java | 2
src/main/java/com/zy/third/service/impl/ExdCustomerServiceImpl.java | 2
src/main/resources/mapper/third/ExdInstockTargetMapper.xml | 17
src/main/java/com/zy/third/entity/ExdDepartment.java | 1
src/main/resources/mapper/third/ExdMaterialMapper.xml | 38
src/main/java/com/zy/third/mapper/ExdSupplierMapper.java | 2
src/main/java/com/zy/third/entity/ExdSupplier.java | 1
src/main/java/com/zy/third/mapper/ExdDepartmentMapper.java | 2
src/main/java/com/zy/third/task/handler/OrderHandler.java | 6
src/main/java/com/zy/asrs/service/OrderDetlService.java | 4
src/main/java/com/zy/third/service/impl/ExdOutstockSourceServiceImpl.java | 2
src/main/java/com/zy/asrs/controller/MatController.java | 1
src/main/java/com/zy/third/entity/ExdEmp.java | 1
src/main/resources/mapper/third/ExdOutstockSourceMapper.xml | 34
src/main/java/com/zy/third/service/impl/ExdInstockSourceServiceImpl.java | 2
src/main/java/com/zy/third/service/impl/ExdSupplierServiceImpl.java | 2
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 4
src/main/java/com/zy/third/service/ExdOutstockSourceService.java | 2
src/main/java/com/zy/third/service/ExdUserService.java | 2
src/main/java/com/zy/third/service/impl/ExdDepartmentServiceImpl.java | 2
src/main/java/com/zy/third/service/ExdOutstockTargetService.java | 2
src/main/java/com/zy/third/service/impl/ExdMaterialServiceImpl.java | 2
src/main/java/com/zy/third/mapper/ExdInstockSourceMapper.java | 7
src/main/webapp/views/user/user.html | 12
src/main/java/com/zy/third/service/impl/ExdUserServiceImpl.java | 2
src/main/java/com/zy/third/service/ExdCustomerService.java | 2
src/main/java/com/zy/third/service/ExdDepartmentService.java | 2
src/main/java/com/zy/third/service/ExdSupplierService.java | 2
src/main/java/com/zy/third/mapper/ExdCustomerMapper.java | 2
src/main/java/com/zy/third/service/ExdMaterialService.java | 2
src/main/java/com/zy/third/mapper/ExdUserMapper.java | 5
src/main/java/com/zy/third/entity/ExdMaterial.java | 4
src/main/java/com/zy/third/mapper/ExdOutstockSourceMapper.java | 6
src/main/java/com/zy/third/service/impl/ExdEmpServiceImpl.java | 2
src/main/java/com/zy/third/entity/ExdCustomer.java | 1
src/main/resources/mapper/asrs/OrderDetlMapper.xml | 19
src/main/java/com/zy/third/entity/ExdInstockTarget.java | 13
src/main/java/com/zy/third/entity/ExdInstockSource.java | 6
src/main/java/com/zy/third/task/OrderScheduler.java | 2
src/main/java/com/zy/third/service/impl/ExdInstockTargetServiceImpl.java | 2
src/main/java/com/zy/third/mapper/ExdInstockTargetMapper.java | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 5
src/main/java/com/zy/common/model/DetlDto.java | 6
src/main/java/com/zy/third/entity/ExdvYanbu.java | 201 +++++++++
src/main/java/com/zy/third/service/impl/ExdOutstockTargetServiceImpl.java | 2
src/main/java/com/zy/third/service/ExdEmpService.java | 2
src/main/resources/com/zy/third/mapper/ExdvYanbuMapper.xml | 14
src/main/java/com/zy/asrs/service/MobileService.java | 2
src/main/java/com/zy/third/entity/ExdOutstockSource.java | 6
src/main/resources/mapper/third/ExdInstockSourceMapper.xml | 30
src/main/java/com/zy/third/entity/ExdOutstockTarget.java | 6
src/main/java/com/zy/third/mapper/ExdMaterialMapper.java | 7
src/main/java/com/zy/third/entity/ExdUser.java | 5
src/main/resources/mapper/third/ExdDepartmentMapper.xml | 2
src/main/resources/mapper/third/ExdEmpMapper.xml | 2
src/main/java/com/zy/asrs/controller/MobileController.java | 555 +++++++++++++-----------
src/main/java/com/zy/third/mapper/ExdEmpMapper.java | 2
src/main/java/com/zy/third/service/ExdInstockSourceService.java | 2
src/main/resources/mapper/third/ExdSupplierMapper.xml | 2
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 24
src/main/resources/mapper/third/ExdOutstockTargetMapper.xml | 20
src/main/java/com/zy/third/service/ExdInstockTargetService.java | 2
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 134 +----
66 files changed, 778 insertions(+), 510 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 41e0df1..e179e04 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -108,6 +108,7 @@
return R.ok(matService.selectOne(new EntityWrapper<Mat>().eq("matnr", matnr)));
}
+
@RequestMapping(value = "/mat/list/auth")
@ManagerAuth
public R list(@RequestParam(defaultValue = "1") Integer curr,
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 4b661c5..8f8ac7e 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -3,12 +3,11 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
-import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.CombParam;
import com.zy.asrs.entity.param.MobileAdjustParam;
@@ -16,13 +15,13 @@
import com.zy.asrs.entity.result.MobileAdjustResult;
import com.zy.asrs.mapper.ManLocDetlMapper;
import com.zy.asrs.service.*;
-import com.zy.common.model.LocDto;
-import com.zy.common.model.TaskDto;
import com.zy.common.model.WrkDto;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import com.zy.system.entity.Config;
import com.zy.system.service.ConfigService;
+import com.zy.third.entity.ExdvYanbu;
+import com.zy.third.mapper.ExdMaterialMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -40,7 +39,7 @@
@Slf4j
@RestController
@RequestMapping("mobile")
-public class MobileController extends BaseController {
+public class MobileController extends BaseController {
@Autowired
private MobileService mobileService;
@@ -80,21 +79,24 @@
@Autowired
private ConfigService configService;
+ @Autowired
+ private ExdMaterialMapper exdMaterialMapper;
+
// 鍟嗗搧涓婃灦
@RequestMapping("/mat/onSale/auth")
@ManagerAuth
- public R matOnSale(@RequestBody CombParam combParam){
+ public R matOnSale(@RequestBody CombParam combParam) {
mobileService.onSale(combParam);
return R.ok("涓婃灦鎴愬姛");
}
+
// 鍟嗗搧涓嬫灦
@RequestMapping("/mat/offSale/auth")
//@ManagerAuth
- public R matOffSale(@RequestBody OffSaleParam offSaleParam){
+ public R matOffSale(@RequestBody OffSaleParam offSaleParam) {
mobileService.offSale(offSaleParam);
return R.ok("涓嬫灦鎴愬姛");
}
-
// 缁勬墭 ----------------------------------------------------------------------------------------------------
@@ -105,7 +107,7 @@
*/
@RequestMapping("/order/search/orderNo/auth")
@ManagerAuth
- public R orderSearchByBarcode(@RequestParam String orderNo){
+ public R orderSearchByBarcode(@RequestParam String orderNo) {
Order order = orderService.selectByNo(orderNo);
if (order == null) {
return R.ok();
@@ -126,14 +128,14 @@
@RequestMapping("/comb/auth")
@ManagerAuth(memo = "缁勬墭")
- public R comb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId());
+ public R comb(@RequestBody CombParam combParam) {
+ mobileService.comb(combParam, getUserId(), getUser().getEmail());
return R.ok("缁勬墭鎴愬姛");
}
@RequestMapping("/pack/get/auth")
@ManagerAuth
- public R packGet(@RequestParam String barcode){
+ public R packGet(@RequestParam String barcode) {
Pack pack = packService.selectByBarcode(barcode);
if (pack == null) {
return R.ok();
@@ -146,7 +148,7 @@
@RequestMapping("/pack/comb/auth")
@ManagerAuth(memo = "涓嬬嚎缁勬墭")
- public R packComb(@RequestBody CombParam combParam){
+ public R packComb(@RequestBody CombParam combParam) {
mobileService.packComb(combParam, getUserId());
return R.ok("缁勬墭鎴愬姛");
}
@@ -159,7 +161,7 @@
@Deprecated
public R pakoutQuery(@RequestParam(required = false) String barcode,
@RequestParam(required = false) Integer staNo,
- @RequestParam(required = false) String matnr){
+ @RequestParam(required = false) String matnr) {
if (Cools.isEmpty(barcode) && Cools.isEmpty(matnr)) {
return R.ok();
}
@@ -183,7 +185,7 @@
*/
@RequestMapping("/pakout/confirm/barcode/auth")
@ManagerAuth
- public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode){
+ public R pakoutQueryByBarcode(@RequestParam(required = false) String barcode) {
if (Cools.isEmpty(barcode)) {
return R.ok();
}
@@ -200,7 +202,7 @@
// 鏍规嵁搴撲綅鐮佸拰鍟嗗搧鐮佹悳绱㈠晢鍝�
@RequestMapping("/mat/find/auth")
public R find(@RequestParam(required = false) String locNo
- , @RequestParam(required = false) String matnr){
+ , @RequestParam(required = false) String matnr) {
//List<ManLocDetl> manLocDetls = manLocDetlMapper.selectItem0(locNo, matnr);
ManLocDetl manLocDetl = manLocDetlMapper.selectLocNo0(locNo, matnr);
return R.ok(manLocDetl);
@@ -213,7 +215,7 @@
@RequestMapping("/pakout/confirm/pick/auth")
@ManagerAuth
public R pakoutQueryByBarcode(@RequestParam(required = false) Integer wrkNo
- , @RequestParam(required = false) String matnr){
+ , @RequestParam(required = false) String matnr) {
if (Cools.isEmpty(wrkNo)) {
return R.ok();
}
@@ -279,9 +281,9 @@
for (WrkDetl wrkDetl : dto.getWrkDetls()) {
wrkDetlService.updateInspect(wrkDetl.getWrkNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
}
- if(wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
+ if (wrkMast.getIoType() == 103 || wrkMast.getIoType() == 107) {
wrkMast.setWrkSts(34L);//涓嬫灦瀹屾垚绛夊緟鍥炲簱
- }else {
+ } else {
wrkMast.setWrkSts(15L);
}
wrkMastService.updateById(wrkMast);
@@ -340,7 +342,7 @@
@RequestMapping("/adjust/auth")
@ManagerAuth(memo = "鐩樼偣")
- public R adjust(@RequestBody MobileAdjustParam combParam){
+ public R adjust(@RequestBody MobileAdjustParam combParam) {
mobileService.adjust(combParam, getUserId());
return R.ok("鐩樼偣鎴愬姛");
}
@@ -348,10 +350,10 @@
@PostMapping("/order/out/pakout/auth")
@ManagerAuth(memo = "璁㈠崟鍑哄簱")
public synchronized R pakoutByOrder(@RequestBody JSONObject param) {
- if(!param.containsKey("staNo") || !param.containsKey("orderNo")){
+ if (!param.containsKey("staNo") || !param.containsKey("orderNo")) {
return R.parse(BaseRes.PARAM);
}
- mobileService.pakoutByOrder(param,getUserId());
+ mobileService.pakoutByOrder(param, getUserId());
return R.ok("鍑哄簱鎴愬姛");
}
@@ -359,38 +361,39 @@
/**
* 琛ョ┖鏉� 鍖哄煙鍒扮偣
+ *
* @param locNo 鐩爣绔欑偣
* @param size 鎵樼洏澶у皬 1锛氬皬鎵樼洏 2锛氬ぇ鎵樼洏
* @return
*/
@RequestMapping("/FillEmptyPallets")
public synchronized R FillEmptyPallets(@RequestParam(required = false) String locNo
- ,@RequestParam(required = false) String size){
+ , @RequestParam(required = false) String size) {
if (Cools.isEmpty(locNo) || Cools.isEmpty(size)) {
return R.error("绔欑偣鎴栬�呭ぇ灏忎笉鑳戒负绌�");
}
//绌烘墭鐩樼紦鍐插尯 灏忥細E8 澶э細E9
- String rStaNo ="E8";
- if(size.equals("2")){
+ String rStaNo = "E8";
+ if (size.equals("2")) {
rStaNo = "E9";
}
- LinkedHashMap<String,Object> rcsParam=new LinkedHashMap<>();
+ LinkedHashMap<String, Object> rcsParam = new LinkedHashMap<>();
rcsParam.put("taskType", "PF-FMR-COMMON");
- List<LinkedHashMap<String,Object>> targetRoutes=new ArrayList<>();
- LinkedHashMap<String,Object> t1=new LinkedHashMap<>();
- LinkedHashMap<String,Object> t2=new LinkedHashMap<>();
+ List<LinkedHashMap<String, Object>> targetRoutes = new ArrayList<>();
+ LinkedHashMap<String, Object> t1 = new LinkedHashMap<>();
+ LinkedHashMap<String, Object> t2 = new LinkedHashMap<>();
t1.put("seq", 0);
- t1.put("type","ZONE");
+ t1.put("type", "ZONE");
t1.put("code", rStaNo);
- t1.put("autoStart",0);
- t1.put("operation","COLLECT");
+ t1.put("autoStart", 0);
+ t1.put("operation", "COLLECT");
t2.put("seq", 0);
- t2.put("type","SITE");
+ t2.put("type", "SITE");
t2.put("code", locNo);
- t2.put("autoStart",0);
- t2.put("operation","DELIVERY");
+ t2.put("autoStart", 0);
+ t2.put("operation", "DELIVERY");
targetRoutes.add(t1);
targetRoutes.add(t2);
@@ -398,119 +401,12 @@
rcsParam.put("initPriority", 100);
- String response ="";
- Boolean bool =false;
+ String response = "";
+ Boolean bool = false;
String msg = "";
- HashMap<String,Object> map = new HashMap<>();
+ HashMap<String, Object> map = new HashMap<>();
Date date = new Date();
- String time = date.getTime()+"";
-
- map.put("X-LR-REQUEST-ID", time);
- try {
- log.info("wms娲惧彂鎼繍浠诲姟缁橝GV鎼繍={}", rcsParam);
- response = new HttpHandler.Builder()
- .setHeaders(map)
- .setUri(url)
- .setHttps(true)
- .setPath(attrcs)
- .setJson(JSON.toJSONString(rcsParam))
- .build()
- .doPostCloseSSL();
- JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.getString("code").equals("SUCCESS")){
- bool = true;
- }else{
- msg=jsonObject.getString("message");
- }
- } catch (Exception e) {
- e.printStackTrace();
- log.error("wms娲惧彂鎼繍浠诲姟缁橝GV鎼繍澶辫触杩斿洖鍊�={}", response);
- } finally {
- apiLogService.save("wms娲惧彂鎼繍浠诲姟缁橝GV鎼繍"
- , url + attrcs
- , null
- , "127.0.0.1"
- , JSON.toJSONString(rcsParam)
- , response
- , bool
- );
- }
-
- if(bool){
- return R.ok();
- }else {
- return R.error(msg);
- }
-
- }
-
- /**
- * 绌烘墭鐩樺洖搴�
- * @param sourceStaNo 鍘熺珯鐐�
- * @param barcode 鎵樼洏澶у皬 1锛氬皬鎵樼洏 2锛氬ぇ鎵樼洏 鐩爣鍖烘垨鑰呭贩閬�
- * @return
- */
- @RequestMapping("/FillEmptyPalletsStack")
- public synchronized R FillEmptyPalletsStack(@RequestParam(required = false) String sourceStaNo
- ,@RequestParam(required = false) String barcode){
- if (Cools.isEmpty(sourceStaNo) || Cools.isEmpty(barcode)) {
- return R.error("绔欑偣鎴栬�呭ぇ灏忎笉鑳戒负绌�");
-
- }
- //绌烘墭鐩樼紦鍐插尯 灏忥細E8 澶э細E9
- String rStaNo ="E8";
- if(barcode.substring(0,1).equals("9")){
- rStaNo = "E9";
- }
- String type ="ZONE"; //鍖哄煙
- Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "autoE").eq("status", "1"));
- if (config != null) {
- type ="STACK"; //宸烽亾
- if (Cools.isEmpty(config.getValue())) {
- rStaNo = rStaNo + "01";
- config.setValue("2");
- }else if (config.getValue().equals("1")) {
- rStaNo = rStaNo + "01";
- config.setValue("2");
- }else if (config.getValue().equals("2")) {
- rStaNo = rStaNo + "02";
- config.setValue("3");
- }else if (config.getValue().equals("3")) {
- rStaNo = rStaNo + "03";
- config.setValue("1");
- }
- configService.updateById(config);
- }
-
- LinkedHashMap<String,Object> rcsParam=new LinkedHashMap<>();
- rcsParam.put("taskType", "PF-FMR-COMMON");
- List<LinkedHashMap<String,Object>> targetRoutes=new ArrayList<>();
- LinkedHashMap<String,Object> t1=new LinkedHashMap<>();
- LinkedHashMap<String,Object> t2=new LinkedHashMap<>();
- t1.put("seq", 0);
- t1.put("type","SITE");
- t1.put("code", sourceStaNo);
- t1.put("autoStart",0);
- t1.put("operation","COLLECT");
-
- t2.put("seq", 0);
- t2.put("type",type);
- t2.put("code", rStaNo);
- t2.put("autoStart",0);
- t2.put("operation","DELIVERY");
-
- targetRoutes.add(t1);
- targetRoutes.add(t2);
- rcsParam.put("targetRoute", targetRoutes);
- rcsParam.put("initPriority", 100);
-
-
- String response ="";
- Boolean bool =false;
- String msg = "";
- HashMap<String,Object> map = new HashMap<>();
- Date date = new Date();
- String time = date.getTime()+"";
+ String time = date.getTime() + "";
map.put("X-LR-REQUEST-ID", time);
try {
@@ -524,10 +420,10 @@
.build()
.doPostCloseSSL();
JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.getString("code").equals("SUCCESS")){
+ if (jsonObject.getString("code").equals("SUCCESS")) {
bool = true;
- }else{
- msg=jsonObject.getString("message");
+ } else {
+ msg = jsonObject.getString("message");
}
} catch (Exception e) {
e.printStackTrace();
@@ -543,9 +439,117 @@
);
}
- if(bool){
+ if (bool) {
return R.ok();
- }else {
+ } else {
+ return R.error(msg);
+ }
+
+ }
+
+ /**
+ * 绌烘墭鐩樺洖搴�
+ *
+ * @param sourceStaNo 鍘熺珯鐐�
+ * @param barcode 鎵樼洏澶у皬 1锛氬皬鎵樼洏 2锛氬ぇ鎵樼洏 鐩爣鍖烘垨鑰呭贩閬�
+ * @return
+ */
+ @RequestMapping("/FillEmptyPalletsStack")
+ public synchronized R FillEmptyPalletsStack(@RequestParam(required = false) String sourceStaNo
+ , @RequestParam(required = false) String barcode) {
+ if (Cools.isEmpty(sourceStaNo) || Cools.isEmpty(barcode)) {
+ return R.error("绔欑偣鎴栬�呭ぇ灏忎笉鑳戒负绌�");
+
+ }
+ //绌烘墭鐩樼紦鍐插尯 灏忥細E8 澶э細E9
+ String rStaNo = "E8";
+ if (barcode.substring(0, 1).equals("9")) {
+ rStaNo = "E9";
+ }
+ String type = "ZONE"; //鍖哄煙
+ Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "autoE").eq("status", "1"));
+ if (config != null) {
+ type = "STACK"; //宸烽亾
+ if (Cools.isEmpty(config.getValue())) {
+ rStaNo = rStaNo + "01";
+ config.setValue("2");
+ } else if (config.getValue().equals("1")) {
+ rStaNo = rStaNo + "01";
+ config.setValue("2");
+ } else if (config.getValue().equals("2")) {
+ rStaNo = rStaNo + "02";
+ config.setValue("3");
+ } else if (config.getValue().equals("3")) {
+ rStaNo = rStaNo + "03";
+ config.setValue("1");
+ }
+ configService.updateById(config);
+ }
+
+ LinkedHashMap<String, Object> rcsParam = new LinkedHashMap<>();
+ rcsParam.put("taskType", "PF-FMR-COMMON");
+ List<LinkedHashMap<String, Object>> targetRoutes = new ArrayList<>();
+ LinkedHashMap<String, Object> t1 = new LinkedHashMap<>();
+ LinkedHashMap<String, Object> t2 = new LinkedHashMap<>();
+ t1.put("seq", 0);
+ t1.put("type", "SITE");
+ t1.put("code", sourceStaNo);
+ t1.put("autoStart", 0);
+ t1.put("operation", "COLLECT");
+
+ t2.put("seq", 0);
+ t2.put("type", type);
+ t2.put("code", rStaNo);
+ t2.put("autoStart", 0);
+ t2.put("operation", "DELIVERY");
+
+ targetRoutes.add(t1);
+ targetRoutes.add(t2);
+ rcsParam.put("targetRoute", targetRoutes);
+ rcsParam.put("initPriority", 100);
+
+
+ String response = "";
+ Boolean bool = false;
+ String msg = "";
+ HashMap<String, Object> map = new HashMap<>();
+ Date date = new Date();
+ String time = date.getTime() + "";
+
+ map.put("X-LR-REQUEST-ID", time);
+ try {
+ log.info("wms娲惧彂鎼繍浠诲姟缁橝GV鎼繍={}", rcsParam);
+ response = new HttpHandler.Builder()
+ .setHeaders(map)
+ .setUri(url)
+ .setHttps(true)
+ .setPath(attrcs)
+ .setJson(JSON.toJSONString(rcsParam))
+ .build()
+ .doPostCloseSSL();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getString("code").equals("SUCCESS")) {
+ bool = true;
+ } else {
+ msg = jsonObject.getString("message");
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ log.error("wms娲惧彂鎼繍浠诲姟缁橝GV鎼繍澶辫触杩斿洖鍊�={}", response);
+ } finally {
+ apiLogService.save("wms娲惧彂鎼繍浠诲姟缁橝GV鎼繍"
+ , url + attrcs
+ , null
+ , "127.0.0.1"
+ , JSON.toJSONString(rcsParam)
+ , response
+ , bool
+ );
+ }
+
+ if (bool) {
+ return R.ok();
+ } else {
return R.error(msg);
}
@@ -554,39 +558,40 @@
/**
* 鎵ц绉诲簱浠诲姟--鐐瑰埌鐐�
+ *
* @param sourceStaNo
* @param staNo
* @return
*/
@RequestMapping("/SITESITEAGVMove")
public synchronized R SITESITEAGVMove(@RequestParam(required = false) String sourceStaNo
- ,@RequestParam(required = false) String staNo
- ,@RequestParam(required = false) String taskNo){
+ , @RequestParam(required = false) String staNo
+ , @RequestParam(required = false) String taskNo) {
if (Cools.isEmpty(sourceStaNo) || Cools.isEmpty(staNo)) {
return R.error("婧愮珯鐐瑰拰鐩爣绔欑偣涓嶈兘涓虹┖");
}
- LinkedHashMap<String,Object> rcsParam=new LinkedHashMap<>();
+ LinkedHashMap<String, Object> rcsParam = new LinkedHashMap<>();
rcsParam.put("taskType", "PF-FMR-COMMON");
- if(!Cools.isEmpty(taskNo)){
+ if (!Cools.isEmpty(taskNo)) {
rcsParam.put("robotTaskCode", taskNo);
}
- List<LinkedHashMap<String,Object>> targetRoutes=new ArrayList<>();
- LinkedHashMap<String,Object> t1=new LinkedHashMap<>();
- LinkedHashMap<String,Object> t2=new LinkedHashMap<>();
+ List<LinkedHashMap<String, Object>> targetRoutes = new ArrayList<>();
+ LinkedHashMap<String, Object> t1 = new LinkedHashMap<>();
+ LinkedHashMap<String, Object> t2 = new LinkedHashMap<>();
t1.put("seq", 0);
- t1.put("type","SITE");
+ t1.put("type", "SITE");
t1.put("code", sourceStaNo);
- t1.put("autoStart",0);
- t1.put("operation","COLLECT");
+ t1.put("autoStart", 0);
+ t1.put("operation", "COLLECT");
t2.put("seq", 0);
- t2.put("type","SITE");
+ t2.put("type", "SITE");
t2.put("code", staNo);
- t2.put("autoStart",0);
- t2.put("operation","DELIVERY");
+ t2.put("autoStart", 0);
+ t2.put("operation", "DELIVERY");
targetRoutes.add(t1);
targetRoutes.add(t2);
@@ -594,12 +599,12 @@
rcsParam.put("initPriority", 100);
- String response ="";
- Boolean bool =false;
+ String response = "";
+ Boolean bool = false;
String msg = "";
- HashMap<String,Object> map = new HashMap<>();
+ HashMap<String, Object> map = new HashMap<>();
Date date = new Date();
- String time = date.getTime()+"";
+ String time = date.getTime() + "";
map.put("X-LR-REQUEST-ID", time);
try {
@@ -613,10 +618,10 @@
.build()
.doPostCloseSSL();
JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.getString("code").equals("SUCCESS")){
+ if (jsonObject.getString("code").equals("SUCCESS")) {
bool = true;
- }else{
- msg=jsonObject.getString("message");
+ } else {
+ msg = jsonObject.getString("message");
}
} catch (Exception e) {
e.printStackTrace();
@@ -632,9 +637,9 @@
);
}
- if(bool){
+ if (bool) {
return R.ok();
- }else {
+ } else {
return R.error(msg);
}
@@ -642,38 +647,39 @@
/**
* 鎵ц绉诲簱浠诲姟--鐐瑰埌鍖哄煙
+ *
* @param sourceStaNo
* @param staNo
* @return
*/
@RequestMapping("/SITEZONEAGVMove")
public synchronized R SITEZONEAGVMove(@RequestParam(required = false) String sourceStaNo
- ,@RequestParam(required = false) String staNo
- ,@RequestParam(required = false) String taskNo){
+ , @RequestParam(required = false) String staNo
+ , @RequestParam(required = false) String taskNo) {
if (Cools.isEmpty(sourceStaNo) || Cools.isEmpty(staNo)) {
return R.error("婧愮珯鐐瑰拰鐩爣绔欑偣涓嶈兘涓虹┖");
}
- LinkedHashMap<String,Object> rcsParam=new LinkedHashMap<>();
+ LinkedHashMap<String, Object> rcsParam = new LinkedHashMap<>();
rcsParam.put("taskType", "PF-FMR-COMMON");
- if(!Cools.isEmpty(taskNo)){
+ if (!Cools.isEmpty(taskNo)) {
rcsParam.put("robotTaskCode", taskNo);
}
- List<LinkedHashMap<String,Object>> targetRoutes=new ArrayList<>();
- LinkedHashMap<String,Object> t1=new LinkedHashMap<>();
- LinkedHashMap<String,Object> t2=new LinkedHashMap<>();
+ List<LinkedHashMap<String, Object>> targetRoutes = new ArrayList<>();
+ LinkedHashMap<String, Object> t1 = new LinkedHashMap<>();
+ LinkedHashMap<String, Object> t2 = new LinkedHashMap<>();
t1.put("seq", 0);
- t1.put("type","SITE");
+ t1.put("type", "SITE");
t1.put("code", sourceStaNo);
- t1.put("autoStart",0);
- t1.put("operation","COLLECT");
+ t1.put("autoStart", 0);
+ t1.put("operation", "COLLECT");
t2.put("seq", 0);
- t2.put("type","ZONE");
+ t2.put("type", "ZONE");
t2.put("code", staNo);
- t2.put("autoStart",0);
- t2.put("operation","DELIVERY");
+ t2.put("autoStart", 0);
+ t2.put("operation", "DELIVERY");
targetRoutes.add(t1);
targetRoutes.add(t2);
@@ -681,12 +687,12 @@
rcsParam.put("initPriority", 100);
- String response ="";
- Boolean bool =false;
+ String response = "";
+ Boolean bool = false;
String msg = "";
- HashMap<String,Object> map = new HashMap<>();
+ HashMap<String, Object> map = new HashMap<>();
Date date = new Date();
- String time = date.getTime()+"";
+ String time = date.getTime() + "";
map.put("X-LR-REQUEST-ID", time);
try {
@@ -700,10 +706,10 @@
.build()
.doPostCloseSSL();
JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.getString("code").equals("SUCCESS")){
+ if (jsonObject.getString("code").equals("SUCCESS")) {
bool = true;
- }else{
- msg=jsonObject.getString("message");
+ } else {
+ msg = jsonObject.getString("message");
}
} catch (Exception e) {
e.printStackTrace();
@@ -719,9 +725,9 @@
);
}
- if(bool){
+ if (bool) {
return R.ok();
- }else {
+ } else {
return R.error(msg);
}
@@ -729,38 +735,39 @@
/**
* 鎵ц绉诲簱浠诲姟--鍖哄煙鍒扮偣
+ *
* @param sourceStaNo
* @param staNo
* @return
*/
@RequestMapping("/ZONESITEAGVMove")
public synchronized R ZONESITEAGVMove(@RequestParam(required = false) String sourceStaNo
- ,@RequestParam(required = false) String staNo
- ,@RequestParam(required = false) String taskNo){
+ , @RequestParam(required = false) String staNo
+ , @RequestParam(required = false) String taskNo) {
if (Cools.isEmpty(sourceStaNo) || Cools.isEmpty(staNo)) {
return R.error("婧愮珯鐐瑰拰鐩爣绔欑偣涓嶈兘涓虹┖");
}
- LinkedHashMap<String,Object> rcsParam=new LinkedHashMap<>();
+ LinkedHashMap<String, Object> rcsParam = new LinkedHashMap<>();
rcsParam.put("taskType", "PF-FMR-COMMON");
- if(!Cools.isEmpty(taskNo)){
+ if (!Cools.isEmpty(taskNo)) {
rcsParam.put("robotTaskCode", taskNo);
}
- List<LinkedHashMap<String,Object>> targetRoutes=new ArrayList<>();
- LinkedHashMap<String,Object> t1=new LinkedHashMap<>();
- LinkedHashMap<String,Object> t2=new LinkedHashMap<>();
+ List<LinkedHashMap<String, Object>> targetRoutes = new ArrayList<>();
+ LinkedHashMap<String, Object> t1 = new LinkedHashMap<>();
+ LinkedHashMap<String, Object> t2 = new LinkedHashMap<>();
t1.put("seq", 0);
- t1.put("type","ZONE");
+ t1.put("type", "ZONE");
t1.put("code", sourceStaNo);
- t1.put("autoStart",0);
- t1.put("operation","COLLECT");
+ t1.put("autoStart", 0);
+ t1.put("operation", "COLLECT");
t2.put("seq", 0);
- t2.put("type","SITE");
+ t2.put("type", "SITE");
t2.put("code", staNo);
- t2.put("autoStart",0);
- t2.put("operation","DELIVERY");
+ t2.put("autoStart", 0);
+ t2.put("operation", "DELIVERY");
targetRoutes.add(t1);
targetRoutes.add(t2);
@@ -768,12 +775,12 @@
rcsParam.put("initPriority", 100);
- String response ="";
- Boolean bool =false;
+ String response = "";
+ Boolean bool = false;
String msg = "";
- HashMap<String,Object> map = new HashMap<>();
+ HashMap<String, Object> map = new HashMap<>();
Date date = new Date();
- String time = date.getTime()+"";
+ String time = date.getTime() + "";
map.put("X-LR-REQUEST-ID", time);
try {
@@ -787,10 +794,10 @@
.build()
.doPostCloseSSL();
JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.getString("code").equals("SUCCESS")){
+ if (jsonObject.getString("code").equals("SUCCESS")) {
bool = true;
- }else{
- msg=jsonObject.getString("message");
+ } else {
+ msg = jsonObject.getString("message");
}
} catch (Exception e) {
e.printStackTrace();
@@ -806,9 +813,9 @@
);
}
- if(bool){
+ if (bool) {
return R.ok();
- }else {
+ } else {
return R.error(msg);
}
@@ -816,54 +823,55 @@
/**
* AGV绔欑偣缁戝畾鍜岃В缁�
- * @param sourceStaNo //绔欑偣
- * @param barcodeType //鎵樼洏鐮�
- * @param invoke //BIND涓虹粦瀹� UNBIND涓鸿В缁�
+ *
+ * @param sourceStaNo //绔欑偣
+ * @param barcodeType //鎵樼洏鐮�
+ * @param invoke //BIND涓虹粦瀹� UNBIND涓鸿В缁�
* @return
*/
@RequestMapping("/siteBindAndUnbind")
public synchronized R siteBindAndUnbind(@RequestParam(required = false) String sourceStaNo
- ,@RequestParam(required = false) String barcodeType
- ,@RequestParam(required = false) String invoke){
+ , @RequestParam(required = false) String barcodeType
+ , @RequestParam(required = false) String invoke) {
if (Cools.isEmpty(sourceStaNo) || Cools.isEmpty(barcodeType)) {
return R.error("绔欑偣鍜屾墭鐩樼被鍨嬩笉鑳戒负绌�");
}
- if(barcodeType.substring(0,1).equals("8")){
- barcodeType="11";
- }else if(barcodeType.substring(0,1).equals("9")){
- barcodeType="21";
+ if (barcodeType.substring(0, 1).equals("8")) {
+ barcodeType = "11";
+ } else if (barcodeType.substring(0, 1).equals("9")) {
+ barcodeType = "21";
}
- LinkedHashMap<String,Object> rcsParam=new LinkedHashMap<>();
+ LinkedHashMap<String, Object> rcsParam = new LinkedHashMap<>();
rcsParam.put("slotCategory", "SITE");
rcsParam.put("slotCode", sourceStaNo);
rcsParam.put("carrierCategory", "PALLET");
rcsParam.put("carrierType", barcodeType);//11涓哄皬鎵樼洏 21涓哄ぇ鎵樼洏
-if(sourceStaNo.equals("101")){
- rcsParam.put("carrierDir","0");
-}else if(sourceStaNo.equals("R01")||sourceStaNo.equals("R03")){
- rcsParam.put("carrierDir","-90");
+ if (sourceStaNo.equals("101")) {
+ rcsParam.put("carrierDir", "0");
+ } else if (sourceStaNo.equals("R01") || sourceStaNo.equals("R03")) {
+ rcsParam.put("carrierDir", "-90");
- }else if(sourceStaNo.equals("R02")){
- rcsParam.put("carrierDir","90");
-}else {
- rcsParam.put("carrierDir","180");
-}
+ } else if (sourceStaNo.equals("R02")) {
+ rcsParam.put("carrierDir", "90");
+ } else {
+ rcsParam.put("carrierDir", "180");
+ }
rcsParam.put("temporary", "");
rcsParam.put("invoke", invoke);
- String response ="";
- Boolean bool =false;
+ String response = "";
+ Boolean bool = false;
String msg = "";
- HashMap<String,Object> map = new HashMap<>();
+ HashMap<String, Object> map = new HashMap<>();
Date date = new Date();
- String time = date.getTime()+"";
+ String time = date.getTime() + "";
map.put("X-LR-REQUEST-ID", time);
try {
- log.info("WMS瀹屾垚"+invoke+"agv绔欑偣={},涓婃姤鍙傛暟涓�={}",sourceStaNo,rcsParam);
+ log.info("WMS瀹屾垚" + invoke + "agv绔欑偣={},涓婃姤鍙傛暟涓�={}", sourceStaNo, rcsParam);
response = new HttpHandler.Builder()
.setHeaders(map)
.setUri(url)
@@ -873,16 +881,16 @@
.build()
.doPostCloseSSL();
JSONObject jsonObject = JSON.parseObject(response);
- if(jsonObject.getString("code").equals("SUCCESS")){
+ if (jsonObject.getString("code").equals("SUCCESS")) {
bool = true;
- }else{
- msg=jsonObject.getString("message");
+ } else {
+ msg = jsonObject.getString("message");
}
} catch (Exception e) {
e.printStackTrace();
- log.error("WMS瀹屾垚"+invoke+"agv绔欑偣澶辫触={}", response);
+ log.error("WMS瀹屾垚" + invoke + "agv绔欑偣澶辫触={}", response);
} finally {
- apiLogService.save("WMS瀹屾垚"+invoke+"agv绔欑偣"+sourceStaNo
+ apiLogService.save("WMS瀹屾垚" + invoke + "agv绔欑偣" + sourceStaNo
, url + siteBindAndUnbing
, null
, "127.0.0.1"
@@ -892,9 +900,9 @@
);
}
- if(bool){
+ if (bool) {
return R.ok();
- }else {
+ } else {
return R.error(msg);
}
@@ -902,36 +910,37 @@
/**
* 绌烘澘鍥炲簱鎴栬�呮嫞鏂欏洖搴�
+ *
* @param sourceStaNo
* @param staNo
* @return
*/
@RequestMapping("/AGVStartReturn")
public synchronized R AGVStartReturn(@RequestParam(required = false) String sourceStaNo
- ,@RequestParam(required = false) String staNo
- ,@RequestParam(required = false) String taskNo){
+ , @RequestParam(required = false) String staNo
+ , @RequestParam(required = false) String taskNo) {
if (Cools.isEmpty(sourceStaNo) || Cools.isEmpty(staNo)) {
return R.error("婧愮珯鐐瑰拰鎵樼洏鐮佷笉鑳戒负绌�");
}
- R r=R.ok();
+ R r = R.ok();
- WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", staNo).in("io_type",103,105,107));
+ 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){
+ r = FillEmptyPalletsStack(sourceStaNo, staNo);
+ } else {
+ if (wrkMast.getWrkSts() > 30) {
return R.error("璇ユ墭鐩�={},娌℃湁涓嬫灦锛岃涓嬫灦鍚庡啀鍥炲簱锛侊紒锛�");
}
- 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)){
- return R.error(wrkMast.getCrnNo()+"鍫嗗灈鏈�,鏈夊嚭搴撲换鍔★紝绂佹鍥炲簱锛侊紒锛�");
+ 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)) {
+ return R.error(wrkMast.getCrnNo() + "鍫嗗灈鏈�,鏈夊嚭搴撲换鍔★紝绂佹鍥炲簱锛侊紒锛�");
}
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
String format = sdf.format(new Date());
- String s = format+"-" + wrkMast.getWrkNo() + "-" + wrkMast.getBarcode();
- r=SITESITEAGVMove(sourceStaNo,wrkMast.getStaNo$(),s);
+ String s = format + "-" + wrkMast.getWrkNo() + "-" + wrkMast.getBarcode();
+ r = SITESITEAGVMove(sourceStaNo, wrkMast.getStaNo$(), s);
if (r.get("code").equals(200)) {
wrkMast.setPdcType(s);
/**
@@ -951,16 +960,38 @@
/**
* 鑾峰彇浠撳簱
+ *
* @return
*/
@RequestMapping("/ck")
@PostMapping
- public R AGVStartReturn(){
- List<String> list=new ArrayList<>();
+ public R AGVStartReturn() {
+ List<String> list = new ArrayList<>();
list.add("鍗婃垚鍝佷粨搴�");
list.add("鎴愬搧浠撳簱");
return R.ok(list);
}
+ @RequestMapping(value = "/mat/tiaoma/auth")
+ @ManagerAuth
+ public R find(@RequestParam("barcode") String barcode) {
+ ExdvYanbu barcode1 = exdMaterialMapper.getBacode(barcode);
+ if (barcode1 == null) {
+ return R.error("鎵规瀵瑰簲鐨勯獙甯冩暟鎹笉瀛樺湪");
+ }
+ return R.ok(barcode1);
+ }
+
+ @RequestMapping(value = "/getOrderNo/auth")
+ @ManagerAuth
+ public R findOrderNo(@RequestParam("orderNo") String orderNo) {
+ Page<Order> orderPage = orderService.selectPage(new Page<>(0, 10), new EntityWrapper<Order>().like("order_no", "%" + orderNo + "%"));
+ List<String> objects = new ArrayList<>();
+ for (Order record : orderPage.getRecords()) {
+ objects.add(record.getOrderNo());
+ }
+ return R.ok(objects);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 466f65a..94ce9f9 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -27,6 +27,9 @@
private String ck;
+ private boolean type = false;
+
+
//agv鐘舵��
/**
* 0锛氭棤闇�璋冪敤AGV
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index b67806c..a5a2736 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -35,6 +35,10 @@
int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty);
+
+ int increaseWorkQty2(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty, @Param("color")String color);
+
+
int increaseWorkQtytest(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("anfme")Double anfme);
}
diff --git a/src/main/java/com/zy/asrs/service/MobileService.java b/src/main/java/com/zy/asrs/service/MobileService.java
index 6172647..5af2226 100644
--- a/src/main/java/com/zy/asrs/service/MobileService.java
+++ b/src/main/java/com/zy/asrs/service/MobileService.java
@@ -15,7 +15,7 @@
/**
* 缁勬墭
*/
- void comb(CombParam param, Long userId);
+ void comb(CombParam param, Long userId, String fxId);
/**
* 涓婃灦
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index ede8c56..d82c544 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -38,5 +38,9 @@
*/
boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
+
+ boolean increaseWorkQty2(Long orderId, String matnr, String batch, Double workQty, String color);
+
+
boolean increaseWorkQtytest(String orderNo, String matnr, String batch, Double anfme);
}
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 6cf5d08..47d2487 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -78,7 +78,7 @@
@Override
@Transactional
- public void comb(CombParam param, Long userId) {
+ public void comb(CombParam param,Long userId,String fxId) {
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
@@ -161,6 +161,7 @@
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
waitPakin.setBrand(param.getCk());//浠撳簱
+ waitPakin.setInspect(param.isType()?1:0);
if(i==1){
// 0锛氫笉闇�瑕佽ˉ绌烘墭鐩�
// 1锛氬皬鎵樼洏
@@ -199,7 +200,7 @@
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
+ if (!orderDetlService.increaseWorkQty2(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme(),fxId)) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index 3e98ae8..dd11979 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -2,11 +2,11 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
-import com.core.common.Cools;
-import com.zy.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.OrderDetlService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.Cools;
+import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.mapper.OrderDetlMapper;
+import com.zy.asrs.service.OrderDetlService;
import org.springframework.stereotype.Service;
import java.util.List;
@@ -80,6 +80,7 @@
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+ *
* @param orderId
* @param matnr
* @param batch
@@ -93,6 +94,21 @@
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+ *
+ * @param orderId
+ * @param matnr
+ * @param batch
+ * @param workQty
+ * @return
+ */
+ @Override
+ public boolean increaseWorkQty2(Long orderId, String matnr, String batch, Double workQty, String color) {
+ return this.baseMapper.increaseWorkQty2(orderId, matnr, batch, workQty, color) > 0;
+ }
+
+ /**
+ * 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
+ *
* @param orderNo
* @param matnr
* @param batch
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..f740939 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,8 +1,5 @@
package com.zy.asrs.task.handler;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
@@ -14,13 +11,12 @@
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
-import com.zy.common.constant.MesConstant;
-import com.zy.common.model.MesPakinParam;
-import com.zy.common.model.MesPakoutParam;
-import com.zy.common.utils.HttpHandler;
+import com.zy.third.entity.ExdInstockTarget;
+import com.zy.third.entity.ExdOutstockTarget;
+import com.zy.third.service.ExdInstockTargetService;
+import com.zy.third.service.ExdOutstockTargetService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -33,8 +29,7 @@
@Service
public class OrderSyncHandler extends AbstractHandler<String> {
- @Autowired
- private JdbcTemplate jdbcTemplate;
+
@Autowired
private OrderService orderService;
@Autowired
@@ -43,6 +38,13 @@
private ApiLogService apiLogService;
@Autowired
private DocTypeService docTypeService;
+
+ @Autowired
+ private ExdInstockTargetService exdInstockTargetService;
+
+
+ @Autowired
+ private ExdOutstockTargetService exdOutstockTargetService;
@Transactional
public ReturnT<String> start(Order order) {
@@ -53,105 +55,29 @@
List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
// 鍏ュ簱瀹屾垚涓婃姤
if (docType.getPakin() == 1) {
- MesPakinParam pakinParam = new MesPakinParam();
- pakinParam.setPakinTime(DateUtils.convert(order.getUpdateTime()));
- pakinParam.setLgortFrom("5008");
- pakinParam.setLgortTo("5006");
+ ExdInstockTarget exdInstockTarge = null;
for (OrderDetl orderDetl : orderDetls) {
- String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
- pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
- }
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKIN_URL)
- .setJson(JSON.toJSONString(pakinParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ exdInstockTarge = new ExdInstockTarget();
+ exdInstockTarge.setFinterid(orderDetl.getDeadWarn());
+ exdInstockTarge.setFbillno(orderDetl.getOrderNo());
+ exdInstockTarge.setFtrantype(order.getDocType().intValue());
+ exdInstockTarge.setFdate(DateUtils.convert(order.getOrderTime()));
+ exdInstockTarge.setFrob(orderDetl.getInspect());
+ exdInstockTarge.setFuserid(Integer.getInteger(orderDetl.getColor()));
+ exdInstockTargetService.insert(exdInstockTarge);
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎴愬搧搴撳叆搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKIN_URL,
- null,
- "127.0.0.1",
- JSON.toJSONString(pakinParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
}
- }
- // 鍑哄簱瀹屾垚涓婃姤
- if (docType.getPakout() == 1) {
- MesPakoutParam pakoutParam = new MesPakoutParam();
- pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("鎵嬪姩鍑哄簱鍗�"));
- pakoutParam.setPakoutTime(DateUtils.convert(order.getUpdateTime()));
- pakoutParam.setLgortFrom("5006");
- pakoutParam.setLgortTo("1111");
- if (!pakoutParam.isTag()) {
- pakoutParam.setKunnr("C1000");
- }
- pakoutParam.setOrderNo(order.getOrderNo());
+ } else if (docType.getPakout() == 1) {
+ // 鍑哄簱瀹屾垚涓婃姤
+ ExdOutstockTarget exdOutstockTarget = null;
for (OrderDetl orderDetl : orderDetls) {
- String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
- pakoutParam.getList().add(new MesPakoutParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
- }
- String response = "";
- boolean success = false;
- try {
- response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKOUT_URL)
- .setJson(JSON.toJSONString(pakoutParam))
- .build()
- .doPost();
- JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("code").equals(200)) {
- success = true;
- // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
- if (!orderService.updateSettle(order.getId(), 6L, null)) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
- }
- } else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);
- throw new CoolException("涓婃姤mes绯荤粺澶辫触");
+ exdOutstockTarget = new ExdOutstockTarget();
+ exdOutstockTargetService.insert(exdOutstockTarget);
+ if (!orderService.updateSettle(order.getId(), 6L, null)) {
+ throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
}
- } catch (Exception e) {
- log.error("fail", e);
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
- return FAIL.setMsg(e.getMessage());
- } finally {
- try {
- // 淇濆瓨鎺ュ彛鏃ュ織
- apiLogService.save(
- "鎴愬搧搴撳嚭搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKOUT_URL,
- null,
- "127.0.0.1",
- JSON.toJSONString(pakoutParam),
- response,
- success
- );
- } catch (Exception e) { log.error("", e); }
}
}
return SUCCESS;
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 650e884..fd70a61 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -4,6 +4,7 @@
import com.zy.asrs.entity.OrderDetl;
import lombok.Data;
+import java.util.Date;
import java.util.List;
import java.util.Set;
@@ -21,6 +22,11 @@
private Double anfme;
+ private Integer frob;
+
+ private Integer FInterID;
+
+
public DetlDto() {
}
diff --git a/src/main/java/com/zy/third/entity/ExdCustomer.java b/src/main/java/com/zy/third/entity/ExdCustomer.java
index a53ce68..3789324 100644
--- a/src/main/java/com/zy/third/entity/ExdCustomer.java
+++ b/src/main/java/com/zy/third/entity/ExdCustomer.java
@@ -17,6 +17,7 @@
/**
*
*/
+ @TableId
private String id;
/**
diff --git a/src/main/java/com/zy/third/entity/ExdDepartment.java b/src/main/java/com/zy/third/entity/ExdDepartment.java
index d5a10d0..3902122 100644
--- a/src/main/java/com/zy/third/entity/ExdDepartment.java
+++ b/src/main/java/com/zy/third/entity/ExdDepartment.java
@@ -17,6 +17,7 @@
/**
*
*/
+ @TableId
private String id;
/**
diff --git a/src/main/java/com/zy/third/entity/ExdEmp.java b/src/main/java/com/zy/third/entity/ExdEmp.java
index 3aa99f5..3a51334 100644
--- a/src/main/java/com/zy/third/entity/ExdEmp.java
+++ b/src/main/java/com/zy/third/entity/ExdEmp.java
@@ -17,6 +17,7 @@
/**
*
*/
+ @TableId
private String id;
/**
diff --git a/src/main/java/com/zy/third/entity/ExdInstockSource.java b/src/main/java/com/zy/third/entity/ExdInstockSource.java
index 9361e3f..e8c04b3 100644
--- a/src/main/java/com/zy/third/entity/ExdInstockSource.java
+++ b/src/main/java/com/zy/third/entity/ExdInstockSource.java
@@ -18,6 +18,12 @@
/**
*
*/
+ @TableId
+ private Long id;
+
+ /**
+ *
+ */
private Integer finterid;
/**
diff --git a/src/main/java/com/zy/third/entity/ExdInstockTarget.java b/src/main/java/com/zy/third/entity/ExdInstockTarget.java
index 4c6e547..947483e 100644
--- a/src/main/java/com/zy/third/entity/ExdInstockTarget.java
+++ b/src/main/java/com/zy/third/entity/ExdInstockTarget.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
+import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
@@ -14,6 +15,12 @@
@TableName(value ="Exd_Instock_Target")
@Data
public class ExdInstockTarget implements Serializable {
+ /**
+ *
+ */
+ @TableId
+ private Long id;
+
/**
*
*/
@@ -157,17 +164,17 @@
/**
*
*/
- private Double gross;
+ private BigDecimal gross;
/**
*
*/
- private Double width;
+ private BigDecimal width;
/**
*
*/
- private Double defects;
+ private BigDecimal defects;
/**
*
diff --git a/src/main/java/com/zy/third/entity/ExdMaterial.java b/src/main/java/com/zy/third/entity/ExdMaterial.java
index 18f758b..8c3a54a 100644
--- a/src/main/java/com/zy/third/entity/ExdMaterial.java
+++ b/src/main/java/com/zy/third/entity/ExdMaterial.java
@@ -5,8 +5,6 @@
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
import java.util.Date;
-
-import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
/**
@@ -19,7 +17,7 @@
/**
*
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId
private String id;
/**
diff --git a/src/main/java/com/zy/third/entity/ExdOutstockSource.java b/src/main/java/com/zy/third/entity/ExdOutstockSource.java
index 8efc08d..ba44c15 100644
--- a/src/main/java/com/zy/third/entity/ExdOutstockSource.java
+++ b/src/main/java/com/zy/third/entity/ExdOutstockSource.java
@@ -18,6 +18,12 @@
/**
*
*/
+ @TableId
+ private Long id;
+
+ /**
+ *
+ */
private Integer finterid;
/**
diff --git a/src/main/java/com/zy/third/entity/ExdOutstockTarget.java b/src/main/java/com/zy/third/entity/ExdOutstockTarget.java
index 334a074..31a8690 100644
--- a/src/main/java/com/zy/third/entity/ExdOutstockTarget.java
+++ b/src/main/java/com/zy/third/entity/ExdOutstockTarget.java
@@ -18,6 +18,12 @@
/**
*
*/
+ @TableId
+ private Long id;
+
+ /**
+ *
+ */
private Integer finterid;
/**
diff --git a/src/main/java/com/zy/third/entity/ExdSupplier.java b/src/main/java/com/zy/third/entity/ExdSupplier.java
index 4e266ed..99d7eab 100644
--- a/src/main/java/com/zy/third/entity/ExdSupplier.java
+++ b/src/main/java/com/zy/third/entity/ExdSupplier.java
@@ -17,6 +17,7 @@
/**
*
*/
+ @TableId
private String id;
/**
diff --git a/src/main/java/com/zy/third/entity/ExdUser.java b/src/main/java/com/zy/third/entity/ExdUser.java
index 9afe113..9cc0bb8 100644
--- a/src/main/java/com/zy/third/entity/ExdUser.java
+++ b/src/main/java/com/zy/third/entity/ExdUser.java
@@ -5,10 +5,7 @@
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
import java.util.Date;
-
-import com.baomidou.mybatisplus.enums.IdType;
import lombok.Data;
-import org.springframework.data.annotation.Id;
/**
*
@@ -20,7 +17,7 @@
/**
*
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId
private String id;
/**
diff --git a/src/main/java/com/zy/third/entity/ExdvYanbu.java b/src/main/java/com/zy/third/entity/ExdvYanbu.java
new file mode 100644
index 0000000..2eb6d0e
--- /dev/null
+++ b/src/main/java/com/zy/third/entity/ExdvYanbu.java
@@ -0,0 +1,201 @@
+package com.zy.third.entity;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import lombok.Data;
+
+/**
+ *
+ * @TableName ExdV_Yanbu
+ */
+@TableName(value ="ExdV_Yanbu")
+@Data
+public class ExdvYanbu implements Serializable {
+ /**
+ *
+ */
+ private String barcode;
+
+ /**
+ *
+ */
+ private BigDecimal qty;
+
+ /**
+ *
+ */
+ private String itemnumber;
+
+ /**
+ *
+ */
+ private String itemname;
+
+ /**
+ *
+ */
+ private String itemmodel;
+
+ /**
+ *
+ */
+ private String batchno;
+
+ /**
+ *
+ */
+ private String icmono;
+
+ /**
+ *
+ */
+ private String pono;
+
+ /**
+ *
+ */
+ private BigDecimal gross;
+
+ /**
+ *
+ */
+ private BigDecimal width;
+
+ /**
+ *
+ */
+ private Integer defects;
+
+ /**
+ *
+ */
+ private String cuspartno;
+
+ /**
+ *
+ */
+ private String supplierpartno;
+
+ /**
+ *
+ */
+ private String supplierno;
+
+ /**
+ *
+ */
+ private Date packdate;
+
+ /**
+ *
+ */
+ private String revision;
+
+ /**
+ *
+ */
+ private Date createdate;
+
+ /**
+ *
+ */
+ private Date readdate;
+
+ /**
+ *
+ */
+ private Integer status;
+
+ /**
+ *
+ */
+ private String parts;
+
+ /**
+ *
+ */
+ private String oemproject;
+
+ /**
+ *
+ */
+ private String qcempid;
+
+ /**
+ *
+ */
+ private String qcempname;
+
+ /**
+ *
+ */
+ private Date modifydate;
+
+ /**
+ *
+ */
+ private String backcode;
+
+ /**
+ *
+ */
+ private String qualitylevel;
+
+ /**
+ *
+ */
+ private String reserve01;
+
+ /**
+ *
+ */
+ private String reserve02;
+
+ /**
+ *
+ */
+ private String reserve03;
+
+ /**
+ *
+ */
+ private BigDecimal reserve04;
+
+ /**
+ *
+ */
+ private BigDecimal reserve05;
+
+ /**
+ *
+ */
+ private String qcempid2;
+
+ /**
+ *
+ */
+ private String qcempname2;
+
+ /**
+ *
+ */
+ private Date packendtime;
+
+ /**
+ *
+ */
+ private String qcempid3;
+
+ /**
+ *
+ */
+ private String qcempname3;
+
+ @TableField(exist = false)
+ private static final long serialVersionUID = 1L;
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/third/mapper/ExdCustomerMapper.java b/src/main/java/com/zy/third/mapper/ExdCustomerMapper.java
index afbde79..eb0e405 100644
--- a/src/main/java/com/zy/third/mapper/ExdCustomerMapper.java
+++ b/src/main/java/com/zy/third/mapper/ExdCustomerMapper.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Customer銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
* @Entity com.zy.third.entity.ExdCustomer
*/
public interface ExdCustomerMapper extends BaseMapper<ExdCustomer> {
diff --git a/src/main/java/com/zy/third/mapper/ExdDepartmentMapper.java b/src/main/java/com/zy/third/mapper/ExdDepartmentMapper.java
index 5b384ed..96b6c5b 100644
--- a/src/main/java/com/zy/third/mapper/ExdDepartmentMapper.java
+++ b/src/main/java/com/zy/third/mapper/ExdDepartmentMapper.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Department銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
* @Entity com.zy.third.entity.ExdDepartment
*/
public interface ExdDepartmentMapper extends BaseMapper<ExdDepartment> {
diff --git a/src/main/java/com/zy/third/mapper/ExdEmpMapper.java b/src/main/java/com/zy/third/mapper/ExdEmpMapper.java
index 74e7732..c6c9b50 100644
--- a/src/main/java/com/zy/third/mapper/ExdEmpMapper.java
+++ b/src/main/java/com/zy/third/mapper/ExdEmpMapper.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Emp銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
* @Entity com.zy.third.entity.ExdEmp
*/
public interface ExdEmpMapper extends BaseMapper<ExdEmp> {
diff --git a/src/main/java/com/zy/third/mapper/ExdInstockSourceMapper.java b/src/main/java/com/zy/third/mapper/ExdInstockSourceMapper.java
index ea0ad9b..d00a787 100644
--- a/src/main/java/com/zy/third/mapper/ExdInstockSourceMapper.java
+++ b/src/main/java/com/zy/third/mapper/ExdInstockSourceMapper.java
@@ -2,7 +2,6 @@
import com.zy.third.entity.ExdInstockSource;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.third.entity.ExdUser;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -10,7 +9,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Instock_Source銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
* @Entity com.zy.third.entity.ExdInstockSource
*/
public interface ExdInstockSourceMapper extends BaseMapper<ExdInstockSource> {
@@ -18,7 +17,5 @@
List<String> listOrderNo();
-
-
- List<ExdInstockSource> listAll(@Param("fbillno") String fbillno);
+ List<ExdInstockSource> listAll(@Param("orderNo") String orderNo);
}
diff --git a/src/main/java/com/zy/third/mapper/ExdInstockTargetMapper.java b/src/main/java/com/zy/third/mapper/ExdInstockTargetMapper.java
index 3799c32..eb26ef6 100644
--- a/src/main/java/com/zy/third/mapper/ExdInstockTargetMapper.java
+++ b/src/main/java/com/zy/third/mapper/ExdInstockTargetMapper.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Instock_Target銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
* @Entity com.zy.third.entity.ExdInstockTarget
*/
public interface ExdInstockTargetMapper extends BaseMapper<ExdInstockTarget> {
diff --git a/src/main/java/com/zy/third/mapper/ExdMaterialMapper.java b/src/main/java/com/zy/third/mapper/ExdMaterialMapper.java
index cd3475e..acb9522 100644
--- a/src/main/java/com/zy/third/mapper/ExdMaterialMapper.java
+++ b/src/main/java/com/zy/third/mapper/ExdMaterialMapper.java
@@ -2,16 +2,21 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.third.entity.ExdMaterial;
+import com.zy.third.entity.ExdvYanbu;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Material銆戠殑鏁版嵁搴撴搷浣淢apper
- * @createDate 2025-09-23 08:36:03
+ * @createDate 2025-09-24 08:20:14
* @Entity com.zy.third.entity.ExdMaterial
*/
public interface ExdMaterialMapper extends BaseMapper<ExdMaterial> {
+ ExdvYanbu getBacode(@Param("barcode") String barcode);
+
+
List<ExdMaterial> listAll();
}
diff --git a/src/main/java/com/zy/third/mapper/ExdOutstockSourceMapper.java b/src/main/java/com/zy/third/mapper/ExdOutstockSourceMapper.java
index f8d5be7..6c0cd65 100644
--- a/src/main/java/com/zy/third/mapper/ExdOutstockSourceMapper.java
+++ b/src/main/java/com/zy/third/mapper/ExdOutstockSourceMapper.java
@@ -2,7 +2,6 @@
import com.zy.third.entity.ExdOutstockSource;
import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.zy.third.entity.ExdUser;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -10,12 +9,13 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Outstock_Source銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
* @Entity com.zy.third.entity.ExdOutstockSource
*/
public interface ExdOutstockSourceMapper extends BaseMapper<ExdOutstockSource> {
+
List<String> listOrderNo();
- List<ExdOutstockSource> listAll(@Param("fbillno") String fbillno);
+ List<ExdOutstockSource> listAll(@Param("orderNo") String orderNo);
}
diff --git a/src/main/java/com/zy/third/mapper/ExdOutstockTargetMapper.java b/src/main/java/com/zy/third/mapper/ExdOutstockTargetMapper.java
index 2f4d672..6f52910 100644
--- a/src/main/java/com/zy/third/mapper/ExdOutstockTargetMapper.java
+++ b/src/main/java/com/zy/third/mapper/ExdOutstockTargetMapper.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Outstock_Target銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
* @Entity com.zy.third.entity.ExdOutstockTarget
*/
public interface ExdOutstockTargetMapper extends BaseMapper<ExdOutstockTarget> {
diff --git a/src/main/java/com/zy/third/mapper/ExdSupplierMapper.java b/src/main/java/com/zy/third/mapper/ExdSupplierMapper.java
index 7b8f9cd..35fb2c6 100644
--- a/src/main/java/com/zy/third/mapper/ExdSupplierMapper.java
+++ b/src/main/java/com/zy/third/mapper/ExdSupplierMapper.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Supplier銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
* @Entity com.zy.third.entity.ExdSupplier
*/
public interface ExdSupplierMapper extends BaseMapper<ExdSupplier> {
diff --git a/src/main/java/com/zy/third/mapper/ExdUserMapper.java b/src/main/java/com/zy/third/mapper/ExdUserMapper.java
index 7cc8a69..0ae5fd3 100644
--- a/src/main/java/com/zy/third/mapper/ExdUserMapper.java
+++ b/src/main/java/com/zy/third/mapper/ExdUserMapper.java
@@ -8,10 +8,11 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_User銆戠殑鏁版嵁搴撴搷浣淢apper
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
* @Entity com.zy.third.entity.ExdUser
*/
public interface ExdUserMapper extends BaseMapper<ExdUser> {
- List<ExdUser> listAll();
+
+ List<ExdUser> listAll();
}
diff --git a/src/main/java/com/zy/third/service/ExdCustomerService.java b/src/main/java/com/zy/third/service/ExdCustomerService.java
index 5aed27c..213c072 100644
--- a/src/main/java/com/zy/third/service/ExdCustomerService.java
+++ b/src/main/java/com/zy/third/service/ExdCustomerService.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Customer銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
public interface ExdCustomerService extends IService<ExdCustomer> {
diff --git a/src/main/java/com/zy/third/service/ExdDepartmentService.java b/src/main/java/com/zy/third/service/ExdDepartmentService.java
index dce56b7..8ee2fe4 100644
--- a/src/main/java/com/zy/third/service/ExdDepartmentService.java
+++ b/src/main/java/com/zy/third/service/ExdDepartmentService.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Department銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
public interface ExdDepartmentService extends IService<ExdDepartment> {
diff --git a/src/main/java/com/zy/third/service/ExdEmpService.java b/src/main/java/com/zy/third/service/ExdEmpService.java
index e9293f8..69d57a7 100644
--- a/src/main/java/com/zy/third/service/ExdEmpService.java
+++ b/src/main/java/com/zy/third/service/ExdEmpService.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Emp銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
public interface ExdEmpService extends IService<ExdEmp> {
diff --git a/src/main/java/com/zy/third/service/ExdInstockSourceService.java b/src/main/java/com/zy/third/service/ExdInstockSourceService.java
index 70b5d18..487869d 100644
--- a/src/main/java/com/zy/third/service/ExdInstockSourceService.java
+++ b/src/main/java/com/zy/third/service/ExdInstockSourceService.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Instock_Source銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
public interface ExdInstockSourceService extends IService<ExdInstockSource> {
diff --git a/src/main/java/com/zy/third/service/ExdInstockTargetService.java b/src/main/java/com/zy/third/service/ExdInstockTargetService.java
index 6e0c8b6..ba38e50 100644
--- a/src/main/java/com/zy/third/service/ExdInstockTargetService.java
+++ b/src/main/java/com/zy/third/service/ExdInstockTargetService.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Instock_Target銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
public interface ExdInstockTargetService extends IService<ExdInstockTarget> {
diff --git a/src/main/java/com/zy/third/service/ExdMaterialService.java b/src/main/java/com/zy/third/service/ExdMaterialService.java
index 513f4a5..5a21a4c 100644
--- a/src/main/java/com/zy/third/service/ExdMaterialService.java
+++ b/src/main/java/com/zy/third/service/ExdMaterialService.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Material銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
public interface ExdMaterialService extends IService<ExdMaterial> {
diff --git a/src/main/java/com/zy/third/service/ExdOutstockSourceService.java b/src/main/java/com/zy/third/service/ExdOutstockSourceService.java
index b72ff7a..2244417 100644
--- a/src/main/java/com/zy/third/service/ExdOutstockSourceService.java
+++ b/src/main/java/com/zy/third/service/ExdOutstockSourceService.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Outstock_Source銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
public interface ExdOutstockSourceService extends IService<ExdOutstockSource> {
diff --git a/src/main/java/com/zy/third/service/ExdOutstockTargetService.java b/src/main/java/com/zy/third/service/ExdOutstockTargetService.java
index 14915d9..ff5bd69 100644
--- a/src/main/java/com/zy/third/service/ExdOutstockTargetService.java
+++ b/src/main/java/com/zy/third/service/ExdOutstockTargetService.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Outstock_Target銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
public interface ExdOutstockTargetService extends IService<ExdOutstockTarget> {
diff --git a/src/main/java/com/zy/third/service/ExdSupplierService.java b/src/main/java/com/zy/third/service/ExdSupplierService.java
index 9d13d85..6c77611 100644
--- a/src/main/java/com/zy/third/service/ExdSupplierService.java
+++ b/src/main/java/com/zy/third/service/ExdSupplierService.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Supplier銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
public interface ExdSupplierService extends IService<ExdSupplier> {
diff --git a/src/main/java/com/zy/third/service/ExdUserService.java b/src/main/java/com/zy/third/service/ExdUserService.java
index 4449cf0..f3e6b90 100644
--- a/src/main/java/com/zy/third/service/ExdUserService.java
+++ b/src/main/java/com/zy/third/service/ExdUserService.java
@@ -6,7 +6,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_User銆戠殑鏁版嵁搴撴搷浣淪ervice
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
public interface ExdUserService extends IService<ExdUser> {
diff --git a/src/main/java/com/zy/third/service/impl/ExdCustomerServiceImpl.java b/src/main/java/com/zy/third/service/impl/ExdCustomerServiceImpl.java
index 369456c..5fe7b5b 100644
--- a/src/main/java/com/zy/third/service/impl/ExdCustomerServiceImpl.java
+++ b/src/main/java/com/zy/third/service/impl/ExdCustomerServiceImpl.java
@@ -9,7 +9,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Customer銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
@Service
public class ExdCustomerServiceImpl extends ServiceImpl<ExdCustomerMapper, ExdCustomer>
diff --git a/src/main/java/com/zy/third/service/impl/ExdDepartmentServiceImpl.java b/src/main/java/com/zy/third/service/impl/ExdDepartmentServiceImpl.java
index 692f0ca..b664a4a 100644
--- a/src/main/java/com/zy/third/service/impl/ExdDepartmentServiceImpl.java
+++ b/src/main/java/com/zy/third/service/impl/ExdDepartmentServiceImpl.java
@@ -9,7 +9,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Department銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
@Service
public class ExdDepartmentServiceImpl extends ServiceImpl<ExdDepartmentMapper, ExdDepartment>
diff --git a/src/main/java/com/zy/third/service/impl/ExdEmpServiceImpl.java b/src/main/java/com/zy/third/service/impl/ExdEmpServiceImpl.java
index 3cfe7de..7a188eb 100644
--- a/src/main/java/com/zy/third/service/impl/ExdEmpServiceImpl.java
+++ b/src/main/java/com/zy/third/service/impl/ExdEmpServiceImpl.java
@@ -9,7 +9,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Emp銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
@Service
public class ExdEmpServiceImpl extends ServiceImpl<ExdEmpMapper, ExdEmp>
diff --git a/src/main/java/com/zy/third/service/impl/ExdInstockSourceServiceImpl.java b/src/main/java/com/zy/third/service/impl/ExdInstockSourceServiceImpl.java
index 645668e..8f4618a 100644
--- a/src/main/java/com/zy/third/service/impl/ExdInstockSourceServiceImpl.java
+++ b/src/main/java/com/zy/third/service/impl/ExdInstockSourceServiceImpl.java
@@ -9,7 +9,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Instock_Source銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
@Service
public class ExdInstockSourceServiceImpl extends ServiceImpl<ExdInstockSourceMapper, ExdInstockSource>
diff --git a/src/main/java/com/zy/third/service/impl/ExdInstockTargetServiceImpl.java b/src/main/java/com/zy/third/service/impl/ExdInstockTargetServiceImpl.java
index efb3ad9..1e89a30 100644
--- a/src/main/java/com/zy/third/service/impl/ExdInstockTargetServiceImpl.java
+++ b/src/main/java/com/zy/third/service/impl/ExdInstockTargetServiceImpl.java
@@ -9,7 +9,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Instock_Target銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
@Service
public class ExdInstockTargetServiceImpl extends ServiceImpl<ExdInstockTargetMapper, ExdInstockTarget>
diff --git a/src/main/java/com/zy/third/service/impl/ExdMaterialServiceImpl.java b/src/main/java/com/zy/third/service/impl/ExdMaterialServiceImpl.java
index 59cd040..8fc4f44 100644
--- a/src/main/java/com/zy/third/service/impl/ExdMaterialServiceImpl.java
+++ b/src/main/java/com/zy/third/service/impl/ExdMaterialServiceImpl.java
@@ -9,7 +9,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Material銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
@Service
public class ExdMaterialServiceImpl extends ServiceImpl<ExdMaterialMapper, ExdMaterial>
diff --git a/src/main/java/com/zy/third/service/impl/ExdOutstockSourceServiceImpl.java b/src/main/java/com/zy/third/service/impl/ExdOutstockSourceServiceImpl.java
index 3523a68..3c0b896 100644
--- a/src/main/java/com/zy/third/service/impl/ExdOutstockSourceServiceImpl.java
+++ b/src/main/java/com/zy/third/service/impl/ExdOutstockSourceServiceImpl.java
@@ -9,7 +9,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Outstock_Source銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
@Service
public class ExdOutstockSourceServiceImpl extends ServiceImpl<ExdOutstockSourceMapper, ExdOutstockSource>
diff --git a/src/main/java/com/zy/third/service/impl/ExdOutstockTargetServiceImpl.java b/src/main/java/com/zy/third/service/impl/ExdOutstockTargetServiceImpl.java
index 90c0749..dd30c34 100644
--- a/src/main/java/com/zy/third/service/impl/ExdOutstockTargetServiceImpl.java
+++ b/src/main/java/com/zy/third/service/impl/ExdOutstockTargetServiceImpl.java
@@ -9,7 +9,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Outstock_Target銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
@Service
public class ExdOutstockTargetServiceImpl extends ServiceImpl<ExdOutstockTargetMapper, ExdOutstockTarget>
diff --git a/src/main/java/com/zy/third/service/impl/ExdSupplierServiceImpl.java b/src/main/java/com/zy/third/service/impl/ExdSupplierServiceImpl.java
index f26cb4f..5a8d71c 100644
--- a/src/main/java/com/zy/third/service/impl/ExdSupplierServiceImpl.java
+++ b/src/main/java/com/zy/third/service/impl/ExdSupplierServiceImpl.java
@@ -9,7 +9,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_Supplier銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
@Service
public class ExdSupplierServiceImpl extends ServiceImpl<ExdSupplierMapper, ExdSupplier>
diff --git a/src/main/java/com/zy/third/service/impl/ExdUserServiceImpl.java b/src/main/java/com/zy/third/service/impl/ExdUserServiceImpl.java
index 12662a0..7b00b52 100644
--- a/src/main/java/com/zy/third/service/impl/ExdUserServiceImpl.java
+++ b/src/main/java/com/zy/third/service/impl/ExdUserServiceImpl.java
@@ -9,7 +9,7 @@
/**
* @author zc857
* @description 閽堝琛ㄣ�怑xd_User銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
-* @createDate 2025-09-23 08:36:03
+* @createDate 2025-09-24 08:20:14
*/
@Service
public class ExdUserServiceImpl extends ServiceImpl<ExdUserMapper, ExdUser>
diff --git a/src/main/java/com/zy/third/task/OrderScheduler.java b/src/main/java/com/zy/third/task/OrderScheduler.java
index e0991a5..5b70d32 100644
--- a/src/main/java/com/zy/third/task/OrderScheduler.java
+++ b/src/main/java/com/zy/third/task/OrderScheduler.java
@@ -68,7 +68,7 @@
@Scheduled(cron = "0/30 * * * * ? ")
public void readOutOrder() {
log.info("璇诲彇鍑哄簱鍗曟嵁");
- List<String> orderNos = exdInstockSourceMapper.listOrderNo();
+ List<String> orderNos = exdOutstockSourceMapper.listOrderNo();
for (String orderNo : orderNos) {
List<ExdOutstockSource> exdOutstockSources = exdOutstockSourceMapper.listAll(orderNo);
try {
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 59d2acd..1a0f615 100644
--- a/src/main/java/com/zy/third/task/handler/OrderHandler.java
+++ b/src/main/java/com/zy/third/task/handler/OrderHandler.java
@@ -66,7 +66,7 @@
order = new Order(
String.valueOf(snowflakeIdWorker.nextId()), // 缂栧彿[闈炵┖]
fbillno, // 璁㈠崟缂栧彿
- DateUtils.convert(now), // 鍗曟嵁鏃ユ湡
+ DateUtils.convert(exdInstockSource.get(0).getFdate()), // 鍗曟嵁鏃ユ湡
docType.getDocId(), // 鍗曟嵁绫诲瀷
null, // 椤圭洰缂栧彿
null, //
@@ -106,6 +106,8 @@
List<DetlDto> list = new ArrayList<>();
for (ExdInstockSource detail : exdInstockSource) {
DetlDto dto = new DetlDto(detail.getFitemid() + "", detail.getFbatchno(), detail.getFqty());
+ dto.setFrob(detail.getFrob());
+ dto.setFInterID(detail.getFinterid());
if (DetlDto.has(list, dto)) {
DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
assert detlDto != null;
@@ -131,6 +133,8 @@
orderDetl.setUpdateTime(now);
orderDetl.setStatus(1);
orderDetl.setQty(0.0D);
+ orderDetl.setDeadWarn(detlDto.getFInterID());
+ orderDetl.setInspect(detlDto.getFrob());
if (!orderDetlService.insert(orderDetl)) {
throw new CoolException("鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
diff --git a/src/main/resources/com/zy/third/mapper/ExdvYanbuMapper.xml b/src/main/resources/com/zy/third/mapper/ExdvYanbuMapper.xml
new file mode 100644
index 0000000..1e734e7
--- /dev/null
+++ b/src/main/resources/com/zy/third/mapper/ExdvYanbuMapper.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+ "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.third.mapper.ExdvYanbuMapper">
+
+ <resultMap id="BaseResultMap" type="com.zy.third.entity.ExdvYanbu">
+ <result property="barcode" column="Barcode" />
+ </resultMap>
+
+ <sql id="Base_Column_List">
+ Barcode
+ </sql>
+</mapper>
diff --git a/src/main/resources/mapper/asrs/OrderDetlMapper.xml b/src/main/resources/mapper/asrs/OrderDetlMapper.xml
index 25b6cf8..fe3f6a5 100644
--- a/src/main/resources/mapper/asrs/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/asrs/OrderDetlMapper.xml
@@ -200,4 +200,23 @@
</choose>
</update>
+ <update id="increaseWorkQty2">
+ update man_order_detl
+ set work_qty = work_qty + #{workQty}
+ where 1=1
+ and order_id = #{orderId}
+ and matnr = #{matnr}
+ <if test="color!=null and color!='' ">
+ and color = #{color}
+ </if>
+ <choose>
+ <when test="batch != null and batch != ''">
+ and batch = #{batch}
+ </when>
+ <otherwise>
+ and (batch IS NULL OR batch = '')
+ </otherwise>
+ </choose>
+ </update>
+
</mapper>
diff --git a/src/main/resources/mapper/third/ExdCustomerMapper.xml b/src/main/resources/mapper/third/ExdCustomerMapper.xml
index d81ca73..30d1709 100644
--- a/src/main/resources/mapper/third/ExdCustomerMapper.xml
+++ b/src/main/resources/mapper/third/ExdCustomerMapper.xml
@@ -5,7 +5,7 @@
<mapper namespace="com.zy.third.mapper.ExdCustomerMapper">
<resultMap id="BaseResultMap" type="com.zy.third.entity.ExdCustomer">
- <result property="id" column="ID" />
+ <id property="id" column="ID" />
<result property="fnumber" column="Fnumber" />
<result property="fname" column="Fname" />
<result property="writetime" column="WriteTime" />
diff --git a/src/main/resources/mapper/third/ExdDepartmentMapper.xml b/src/main/resources/mapper/third/ExdDepartmentMapper.xml
index 968b361..e8afdec 100644
--- a/src/main/resources/mapper/third/ExdDepartmentMapper.xml
+++ b/src/main/resources/mapper/third/ExdDepartmentMapper.xml
@@ -5,7 +5,7 @@
<mapper namespace="com.zy.third.mapper.ExdDepartmentMapper">
<resultMap id="BaseResultMap" type="com.zy.third.entity.ExdDepartment">
- <result property="id" column="ID" />
+ <id property="id" column="ID" />
<result property="fnumber" column="Fnumber" />
<result property="fname" column="Fname" />
<result property="writetime" column="WriteTime" />
diff --git a/src/main/resources/mapper/third/ExdEmpMapper.xml b/src/main/resources/mapper/third/ExdEmpMapper.xml
index 872e54c..203db63 100644
--- a/src/main/resources/mapper/third/ExdEmpMapper.xml
+++ b/src/main/resources/mapper/third/ExdEmpMapper.xml
@@ -5,7 +5,7 @@
<mapper namespace="com.zy.third.mapper.ExdEmpMapper">
<resultMap id="BaseResultMap" type="com.zy.third.entity.ExdEmp">
- <result property="id" column="ID" />
+ <id property="id" column="ID" />
<result property="fnumber" column="Fnumber" />
<result property="fname" column="Fname" />
<result property="writetime" column="WriteTime" />
diff --git a/src/main/resources/mapper/third/ExdInstockSourceMapper.xml b/src/main/resources/mapper/third/ExdInstockSourceMapper.xml
index 9567499..b4799be 100644
--- a/src/main/resources/mapper/third/ExdInstockSourceMapper.xml
+++ b/src/main/resources/mapper/third/ExdInstockSourceMapper.xml
@@ -5,6 +5,7 @@
<mapper namespace="com.zy.third.mapper.ExdInstockSourceMapper">
<resultMap id="BaseResultMap" type="com.zy.third.entity.ExdInstockSource">
+ <id property="id" column="ID" />
<result property="finterid" column="FInterID" />
<result property="fbillno" column="FBillNo" />
<result property="ftrantype" column="FTranType" />
@@ -39,26 +40,25 @@
</resultMap>
<sql id="Base_Column_List">
- FInterID,FBillNo,FTranType,FDate,FROB,FDeptID,
- FSupplyID,FBillerID,FEntryID,FItemID,FQty,
- Fprice,FBatchNo,FUnitID,FSourceBillNo,FSourceEntryID,
- FSourceInterId,FSourceTranType,FDCSPID,FDCStockID,FOrderBillNo,
- FOrderEntryID,FOrderInterID,FPlanMode,WriteTime,Writor,
- Status,ReadTime,Reador,WritorMsg,ReadorMsg
+ ID,FInterID,FBillNo,FTranType,FDate,FROB,
+ FDeptID,FSupplyID,FBillerID,FEntryID,FItemID,
+ FQty,Fprice,FBatchNo,FUnitID,FSourceBillNo,
+ FSourceEntryID,FSourceInterId,FSourceTranType,FDCSPID,FDCStockID,
+ FOrderBillNo,FOrderEntryID,FOrderInterID,FPlanMode,WriteTime,
+ Writor,Status,ReadTime,Reador,WritorMsg,
+ ReadorMsg
</sql>
-
- <select id="listOrderNo" resultMap="BaseResultMap">
- select top 100 distinct FBillNo
- <include refid="Base_Column_List" />
+ <select id="listOrderNo" resultType="java.lang.String">
+ select distinct fbillno
from Exd_Instock_Source
where status = 0
</select>
- <select id="listAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from Exd_Instock_Source
- where FBillNo = #{fbillno}
+
+ <select id="listAll" resultType="com.zy.third.entity.ExdInstockSource">
+ select * from Exd_Instock_Source where fbillno = #{orderNo}
</select>
+
+
</mapper>
diff --git a/src/main/resources/mapper/third/ExdInstockTargetMapper.xml b/src/main/resources/mapper/third/ExdInstockTargetMapper.xml
index 46b4f09..02dcfc8 100644
--- a/src/main/resources/mapper/third/ExdInstockTargetMapper.xml
+++ b/src/main/resources/mapper/third/ExdInstockTargetMapper.xml
@@ -5,6 +5,7 @@
<mapper namespace="com.zy.third.mapper.ExdInstockTargetMapper">
<resultMap id="BaseResultMap" type="com.zy.third.entity.ExdInstockTarget">
+ <id property="id" column="ID" />
<result property="finterid" column="FInterID" />
<result property="fbillno" column="FBillNo" />
<result property="ftrantype" column="FTranType" />
@@ -47,13 +48,13 @@
</resultMap>
<sql id="Base_Column_List">
- FInterID,FBillNo,FTranType,FDate,FROB,FUserID,
- FDeptID,FSupplyID,FBillerID,FFManagerID,FSManagerID,
- FEntryID,FItemID,FQty,Fprice,FBatchNo,
- FUnitID,FSourceBillNo,FSourceEntryID,FSourceInterId,FSourceTranType,
- FDCSPID,FDCStockID,FOrderBillNo,FOrderEntryID,FOrderInterID,
- FPlanMode,Barcode,Gross,Width,Defects,
- BackCode,WriteTime,Writor,Status,ReadTime,
- Reador,WritorMsg,ReadorMsg
+ ID,FInterID,FBillNo,FTranType,FDate,FROB,
+ FUserID,FDeptID,FSupplyID,FBillerID,FFManagerID,
+ FSManagerID,FEntryID,FItemID,FQty,Fprice,
+ FBatchNo,FUnitID,FSourceBillNo,FSourceEntryID,FSourceInterId,
+ FSourceTranType,FDCSPID,FDCStockID,FOrderBillNo,FOrderEntryID,
+ FOrderInterID,FPlanMode,Barcode,Gross,Width,
+ Defects,BackCode,WriteTime,Writor,Status,
+ ReadTime,Reador,WritorMsg,ReadorMsg
</sql>
</mapper>
diff --git a/src/main/resources/mapper/third/ExdMaterialMapper.xml b/src/main/resources/mapper/third/ExdMaterialMapper.xml
index 51aa6be..7b8589b 100644
--- a/src/main/resources/mapper/third/ExdMaterialMapper.xml
+++ b/src/main/resources/mapper/third/ExdMaterialMapper.xml
@@ -5,30 +5,34 @@
<mapper namespace="com.zy.third.mapper.ExdMaterialMapper">
<resultMap id="BaseResultMap" type="com.zy.third.entity.ExdMaterial">
- <result property="id" column="ID" />
- <result property="fnumber" column="Fnumber" />
- <result property="fname" column="Fname" />
- <result property="fmodel" column="Fmodel" />
- <result property="writetime" column="WriteTime" />
- <result property="writor" column="Writor" />
- <result property="status" column="Status" />
- <result property="readtime" column="ReadTime" />
- <result property="reador" column="Reador" />
- <result property="writormsg" column="WritorMsg" />
- <result property="readormsg" column="ReadorMsg" />
+ <id property="id" column="ID"/>
+ <result property="fnumber" column="Fnumber"/>
+ <result property="fname" column="Fname"/>
+ <result property="fmodel" column="Fmodel"/>
+ <result property="writetime" column="WriteTime"/>
+ <result property="writor" column="Writor"/>
+ <result property="status" column="Status"/>
+ <result property="readtime" column="ReadTime"/>
+ <result property="reador" column="Reador"/>
+ <result property="writormsg" column="WritorMsg"/>
+ <result property="readormsg" column="ReadorMsg"/>
</resultMap>
<sql id="Base_Column_List">
- ID,Fnumber,Fname,Fmodel,WriteTime,Writor,
+ ID
+ ,Fnumber,Fname,Fmodel,WriteTime,Writor,
Status,ReadTime,Reador,WritorMsg,ReadorMsg
</sql>
-
-
- <select id="listAll" resultMap="BaseResultMap">
- select top 200
- <include refid="Base_Column_List" />
+ <select id="listAll" resultType="com.zy.third.entity.ExdMaterial">
+ select top 100 *
from Exd_Material
where status = 0
</select>
+ <select id="getBacode" resultType="com.zy.third.entity.ExdvYanbu" parameterType="string">
+ SELECT top 1 *
+ FROM [Textile].[trade].[TianfuQcResult]
+ where Barcode = #{barcode}
+ </select>
+
</mapper>
diff --git a/src/main/resources/mapper/third/ExdOutstockSourceMapper.xml b/src/main/resources/mapper/third/ExdOutstockSourceMapper.xml
index 67ce4dd..2d44a34 100644
--- a/src/main/resources/mapper/third/ExdOutstockSourceMapper.xml
+++ b/src/main/resources/mapper/third/ExdOutstockSourceMapper.xml
@@ -5,6 +5,7 @@
<mapper namespace="com.zy.third.mapper.ExdOutstockSourceMapper">
<resultMap id="BaseResultMap" type="com.zy.third.entity.ExdOutstockSource">
+ <id property="id" column="ID" />
<result property="finterid" column="FInterID" />
<result property="fbillno" column="FBillNo" />
<result property="ftrantype" column="FTranType" />
@@ -41,27 +42,26 @@
</resultMap>
<sql id="Base_Column_List">
- FInterID,FBillNo,FTranType,FDate,FROB,FDeptID,
- FSupplyID,FBillerID,FEntryID,FItemID,FQty,
- Fprice,FBatchNo,FUnitID,FSourceBillNo,FSourceEntryID,
- FSourceInterId,FSourceTranType,FDCSPID,FDCStockID,FSCSPID,
- FSCStockID,FOrderBillNo,FOrderEntryID,FOrderInterID,FPlanMode,
- WriteTime,Writor,Status,ReadTime,Reador,
- WritorMsg,ReadorMsg
+ ID,FInterID,FBillNo,FTranType,FDate,FROB,
+ FDeptID,FSupplyID,FBillerID,FEntryID,FItemID,
+ FQty,Fprice,FBatchNo,FUnitID,FSourceBillNo,
+ FSourceEntryID,FSourceInterId,FSourceTranType,FDCSPID,FDCStockID,
+ FSCSPID,FSCStockID,FOrderBillNo,FOrderEntryID,FOrderInterID,
+ FPlanMode,WriteTime,Writor,Status,ReadTime,
+ Reador,WritorMsg,ReadorMsg
</sql>
- <select id="listOrderNo" resultMap="BaseResultMap">
- select top 100 distinct FBillNo
- <include refid="Base_Column_List" />
- from Exd_Instock_Source
- where status = 0
+
+ <select id="listOrderNo" resultType="java.lang.String">
+ select distinct fbillno
+ from Exd_Outstock_Source
+ where status = 0
</select>
- <select id="listAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
- from Exd_Outstock_Source
- where FBillNo = #{fbillno}
+ <select id="listAll" resultType="com.zy.third.entity.ExdOutstockSource">
+ select * from Exd_Outstock_Source where fbillno = #{orderNo}
</select>
+
+
</mapper>
diff --git a/src/main/resources/mapper/third/ExdOutstockTargetMapper.xml b/src/main/resources/mapper/third/ExdOutstockTargetMapper.xml
index 897eaf7..06859e4 100644
--- a/src/main/resources/mapper/third/ExdOutstockTargetMapper.xml
+++ b/src/main/resources/mapper/third/ExdOutstockTargetMapper.xml
@@ -5,6 +5,7 @@
<mapper namespace="com.zy.third.mapper.ExdOutstockTargetMapper">
<resultMap id="BaseResultMap" type="com.zy.third.entity.ExdOutstockTarget">
+ <id property="id" column="ID" />
<result property="finterid" column="FInterID" />
<result property="fbillno" column="FBillNo" />
<result property="ftrantype" column="FTranType" />
@@ -48,13 +49,16 @@
</resultMap>
<sql id="Base_Column_List">
- FInterID,FBillNo,FTranType,FDate,FROB,FUserID,
- FDeptID,FSupplyID,FBillerID,FEntryID,FItemID,
- FQtyMust,FQty,Fprice,FBatchNo,FUnitID,
- FSourceBillNo,FSourceEntryID,FSourceInterId,FSourceTranType,FDCSPID,
- FDCStockID,FSCSPID,FSCStockID,FOrderBillNo,FOrderEntryID,
- FOrderInterID,FPlanMode,Barcode,Gross,Width,
- Defects,BackCode,WriteTime,Writor,Status,
- ReadTime,Reador,WritorMsg,ReadorMsg
+ ID,FInterID,FBillNo,FTranType,FDate,FROB,
+ FUserID,FDeptID,FSupplyID,FBillerID,FEntryID,
+ FItemID,FQtyMust,FQty,Fprice,FBatchNo,
+ FUnitID,FSourceBillNo,FSourceEntryID,FSourceInterId,FSourceTranType,
+ FDCSPID,FDCStockID,FSCSPID,FSCStockID,FOrderBillNo,
+ FOrderEntryID,FOrderInterID,FPlanMode,Barcode,Gross,
+ Width,Defects,BackCode,WriteTime,Writor,
+ Status,ReadTime,Reador,WritorMsg,ReadorMsg
</sql>
+
+
+
</mapper>
diff --git a/src/main/resources/mapper/third/ExdSupplierMapper.xml b/src/main/resources/mapper/third/ExdSupplierMapper.xml
index 3b8ea79..3e819c6 100644
--- a/src/main/resources/mapper/third/ExdSupplierMapper.xml
+++ b/src/main/resources/mapper/third/ExdSupplierMapper.xml
@@ -5,7 +5,7 @@
<mapper namespace="com.zy.third.mapper.ExdSupplierMapper">
<resultMap id="BaseResultMap" type="com.zy.third.entity.ExdSupplier">
- <result property="id" column="ID" />
+ <id property="id" column="ID" />
<result property="fnumber" column="Fnumber" />
<result property="fname" column="Fname" />
<result property="writetime" column="WriteTime" />
diff --git a/src/main/resources/mapper/third/ExdUserMapper.xml b/src/main/resources/mapper/third/ExdUserMapper.xml
index ecc8767..61c5ea2 100644
--- a/src/main/resources/mapper/third/ExdUserMapper.xml
+++ b/src/main/resources/mapper/third/ExdUserMapper.xml
@@ -5,27 +5,29 @@
<mapper namespace="com.zy.third.mapper.ExdUserMapper">
<resultMap id="BaseResultMap" type="com.zy.third.entity.ExdUser">
- <result property="id" column="ID" />
- <result property="name" column="Name" />
- <result property="writetime" column="WriteTime" />
- <result property="writor" column="Writor" />
- <result property="status" column="Status" />
- <result property="readtime" column="ReadTime" />
- <result property="reador" column="Reador" />
- <result property="writormsg" column="WritorMsg" />
- <result property="readormsg" column="ReadorMsg" />
+ <id property="id" column="ID"/>
+ <result property="name" column="Name"/>
+ <result property="writetime" column="WriteTime"/>
+ <result property="writor" column="Writor"/>
+ <result property="status" column="Status"/>
+ <result property="readtime" column="ReadTime"/>
+ <result property="reador" column="Reador"/>
+ <result property="writormsg" column="WritorMsg"/>
+ <result property="readormsg" column="ReadorMsg"/>
</resultMap>
<sql id="Base_Column_List">
- ID,Name,WriteTime,Writor,Status,ReadTime,
+ ID
+ ,Name,WriteTime,Writor,Status,ReadTime,
Reador,WritorMsg,ReadorMsg
</sql>
- <select id="listAll" resultMap="BaseResultMap">
- select
- <include refid="Base_Column_List" />
+ <select id="listAll" resultType="com.zy.third.entity.ExdUser">
+ select top 100 *
from Exd_User
where status = 0
</select>
+
+
</mapper>
diff --git a/src/main/webapp/views/user/user.html b/src/main/webapp/views/user/user.html
index d2611c8..3aaec6e 100644
--- a/src/main/webapp/views/user/user.html
+++ b/src/main/webapp/views/user/user.html
@@ -130,12 +130,12 @@
<input name="mobile" placeholder="璇疯緭鍏ユ墜鏈哄彿" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
- <div class="layui-form-item">
- <label class="layui-form-label">閭</label>
- <div class="layui-input-block">
- <input name="email" placeholder="璇疯緭鍏ラ偖绠�" class="layui-input">
- </div>
- </div>
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">閭</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input name="email" placeholder="璇疯緭鍏ラ偖绠�" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
</div>
--
Gitblit v1.9.1