From 9312af7cd78b3ff901c8986f00307cd1aa32af24 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 28 十二月 2023 17:01:09 +0800
Subject: [PATCH] #
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java | 5 ++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java | 9 ----
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java | 9 ----
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java | 4 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java | 62 +++++++++++++++++++------------
zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js | 2 -
6 files changed, 47 insertions(+), 44 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java
index 8bcbf64..417fb05 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkDetl.java
@@ -2,6 +2,8 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.zy.asrs.common.utils.Synchro;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -464,5 +466,8 @@
return null;
}
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
+ }
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java
index 0b61146..042e7ab 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMast.java
@@ -60,12 +60,6 @@
private Integer ioType;
/**
- * 鍫嗗灈鏈�
- */
- @ApiModelProperty(value= "鍫嗗灈鏈�")
- private Integer crnNo;
-
- /**
* 浼樺厛绾�
*/
@ApiModelProperty(value= "浼樺厛绾�")
@@ -188,11 +182,10 @@
public WrkMast() {}
- public WrkMast(Integer wrkNo,Long wrkSts,Integer ioType,Integer crnNo,Double ioPri,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String picking,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String modiUser,Date modiTime,String appeUser,Date appeTime,Date errorTime,String errorMemo,String manuType,String memo,String barcode,String fullPlt,Long hostId) {
+ public WrkMast(Integer wrkNo,Long wrkSts,Integer ioType,Double ioPri,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String picking,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String modiUser,Date modiTime,String appeUser,Date appeTime,Date errorTime,String errorMemo,String manuType,String memo,String barcode,String fullPlt,Long hostId) {
this.wrkNo = wrkNo;
this.wrkSts = wrkSts;
this.ioType = ioType;
- this.crnNo = crnNo;
this.ioPri = ioPri;
this.locNo = locNo;
this.staNo = staNo;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java
index cf9ebf8..f328b2b 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/WrkMastLog.java
@@ -59,12 +59,6 @@
private Integer ioType;
/**
- * 鍫嗗灈鏈�
- */
- @ApiModelProperty(value= "鍫嗗灈鏈�")
- private Integer crnNo;
-
- /**
* 浼樺厛绾�
*/
@ApiModelProperty(value= "浼樺厛绾�")
@@ -187,12 +181,11 @@
public WrkMastLog() {}
- public WrkMastLog(Long id,Integer wrkNo,Long wrkSts,Integer ioType,Integer crnNo,Double ioPri,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String picking,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String modiUser,Date modiTime,String appeUser,Date appeTime,Date errorTime,String errorMemo,String manuType,String memo,String barcode,String fullPlt,Long hostId) {
+ public WrkMastLog(Long id,Integer wrkNo,Long wrkSts,Integer ioType,Double ioPri,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String picking,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String modiUser,Date modiTime,String appeUser,Date appeTime,Date errorTime,String errorMemo,String manuType,String memo,String barcode,String fullPlt,Long hostId) {
this.id = id;
this.wrkNo = wrkNo;
this.wrkSts = wrkSts;
this.ioType = ioType;
- this.crnNo = crnNo;
this.ioPri = ioPri;
this.locNo = locNo;
this.staNo = staNo;
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
index 9007a55..8e12215 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/CommonService.java
@@ -283,9 +283,9 @@
}
// 妫�娴嬬洰鏍囩珯
- BasDevp staNo = basDevpService.getById(staDesc.getDeviceNo());
+ BasDevp staNo = basDevpService.getById(staDesc.getDeviceStn());
if (!staNo.getAutoing().equals("Y")) {
- throw new CoolException("鐩爣绔�" + staDesc.getDeviceNo() + "涓嶅彲鐢�");
+ throw new CoolException("鐩爣绔�" + staDesc.getDeviceStn() + "涓嶅彲鐢�");
}
// 鐢熸垚宸ヤ綔鍙�
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
index 0a57a7f..f62ee2d 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/WorkServiceImpl.java
@@ -5,9 +5,7 @@
import com.zy.asrs.common.domain.dto.LocTypeDto;
import com.zy.asrs.common.domain.dto.StartupDto;
import com.zy.asrs.common.domain.param.FullStoreParam;
-import com.zy.asrs.common.wms.entity.BasDevp;
-import com.zy.asrs.common.wms.entity.LocMast;
-import com.zy.asrs.common.wms.entity.WrkMast;
+import com.zy.asrs.common.wms.entity.*;
import com.zy.asrs.common.wms.service.*;
import com.zy.asrs.framework.common.BaseRes;
import com.zy.asrs.framework.common.Cools;
@@ -38,6 +36,8 @@
private WrkDetlService wrkDetlService;
@Autowired
private LocMastService locMastService;
+ @Autowired
+ private MatService matService;
@Override
@Transactional
@@ -58,7 +58,6 @@
wrkMast.setWrkSts(1L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱
wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
wrkMast.setIoPri(13D); // 浼樺厛绾э細13
- wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
wrkMast.setLocNo(dto.getLocNo());
@@ -87,26 +86,41 @@
detlDtos.add(detlDto);
}
});
-// wrkDetlService.createWorkDetail(workNo, detlDtos, param.getBarcode(), userId);
-// // 鏇存柊婧愮珯鐐逛俊鎭�
-// sourceStaNo.setWrkNo(workNo);
-// sourceStaNo.setModiUser(userId);
-// sourceStaNo.setModiTime(now);
-// if (!basDevpService.updateById(sourceStaNo)){
-// throw new CoolException("鏇存柊婧愮珯澶辫触");
-// }
-// // 鏇存柊鐩爣搴撲綅鐘舵��
-// LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, dto.getLocNo()));
-// if (locMast.getLocSts().equals("O")){
-// locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
-// locMast.setModiUser(userId);
-// locMast.setModiTime(now);
-// if (!locMastService.updateById(locMast)){
-// throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
-// }
-// } else {
-// throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
-// }
+
+ for (DetlDto detlDto : detlDtos) {
+ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, detlDto.getMatnr()).eq(Mat::getHostId, hostId));
+ if (Cools.isEmpty(mat)){
+ throw new CoolException(detlDto.getMatnr() + "鍟嗗搧缁存姢澶辫触");
+ }
+ // 淇濇寔宸ヤ綔妗ｆ槑缁�
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(mat);
+ wrkDetl.setWrkNo(workNo);
+ wrkDetl.setIoTime(now);
+ wrkDetl.setBatch(detlDto.getBatch());
+ wrkDetl.setAnfme(detlDto.getAnfme()); // 鏁伴噺
+ wrkDetl.setZpallet(param.getBarcode()); // 鎵樼洏鏉＄爜
+ wrkDetl.setAppeUser(userId);
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiUser(userId);
+ wrkDetl.setModiTime(now);
+ if (!wrkDetlService.save(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ }
+
+ // 鏇存柊鐩爣搴撲綅鐘舵��
+ LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, dto.getLocNo()).eq(LocMast::getHostId, hostId));
+ if (locMast.getLocSts().equals("O")){
+ locMast.setLocSts("S"); // S.鍏ュ簱棰勭害
+ locMast.setModiUser(userId);
+ locMast.setModiTime(now);
+ if (!locMastService.updateById(locMast)){
+ throw new CoolException("鏀瑰彉搴撲綅鐘舵�佸け璐�");
+ }
+ } else {
+ throw new CoolException(dto.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
+ }
return dto.getLocNo();
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js b/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js
index de1842d..a9c7a45 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -25,13 +25,11 @@
,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
,{field: 'ioPri', align: 'center',title: '浼樺厛绾�'}
- ,{field: 'crnNo$', align: 'center',title: '鍫嗗灈鏈�'}
,{field: 'sourceStaNo$', align: 'center',title: '婧愮珯'}
,{field: 'staNo$', align: 'center',title: '鐩爣绔�'}
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
,{field: 'barcode', align: 'center',title: '鏉＄爜'}
- ,{field: 'invWh', align: 'center',title: '纭鍚�', width:75}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
// ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
--
Gitblit v1.9.1