From fb3519e760382ceb0b0844c4acd70fd91892bc26 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 01 十一月 2022 09:44:21 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 6 ++++++
src/main/java/com/zy/asrs/entity/WaitPakin.java | 3 +++
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 2 ++
src/main/java/com/zy/asrs/entity/WrkDetl.java | 5 +++++
src/main/java/com/zy/asrs/entity/WrkMast.java | 5 +++++
src/main/java/com/zy/common/model/DetlDto.java | 12 ++++++++++++
src/main/java/com/zy/common/web/WcsController.java | 5 +++++
src/main/webapp/static/js/locMast/locMast.js | 2 ++
src/main/java/com/zy/asrs/entity/LocMast.java | 5 +++++
src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java | 2 +-
10 files changed, 46 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 23d8301..cd5f3ba 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -176,6 +176,11 @@
@TableField("ctn_no")
private String ctnNo;
+ /**
+ * 鏄惁鍐荤粨
+ */
+ @ApiModelProperty(value= "鏄惁鍐荤粨")
+ private Integer frozen;
public String getWhsType$(){
BasWhsService service = SpringUtils.getBean(BasWhsService.class);
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 78185ae..6037263 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -152,6 +152,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "鏄惁鍐荤粨")
+ private Integer frozen;
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 39ea4d5..6431820 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -268,6 +268,11 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 鏄惁鍐荤粨
+ */
+ @ApiModelProperty(value= "鏄惁鍐荤粨")
+ private Integer frozen;
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 69a19c4..34963fb 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -335,6 +335,11 @@
@TableField("take_none")
private String takeNone;
+ /**
+ * 鏄惁鍐荤粨
+ */
+ @ApiModelProperty(value= "鏄惁鍐荤粨")
+ private Integer frozen;
public WrkMast() {}
public String getYmd$(){
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 84a4927..b655332 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -16,6 +16,9 @@
// 鎵樼洏鏉＄爜
private String barcode;
+ // 鏄惁鍐荤粨
+ private Integer frozen;
+
private List<CombMat> combMats;
@Data
@@ -30,6 +33,9 @@
// 鐗╂枡鏁伴噺
private Double anfme;
+ // 澶囨敞
+ private String memo;
+
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
index d35a6d5..c8fb7ed 100644
--- a/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpServiceImpl.java
@@ -59,7 +59,7 @@
if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
WrkMast wrkMast = wrkMastService.selectById(station.getWrkNo());
- if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
+ if (wrkMast!=null && wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
throw new CoolException(devpNo+"绔欑偣宸叉湁宸ヤ綔鍙�");
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index 8309fe1..29c66b1 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -127,6 +127,7 @@
if (locMast.getLocSts().equals("S")) {
locMast.setLocSts("F");
locMast.setBarcode(wrkMast.getBarcode());
+ locMast.setFrozen(wrkMast.getFrozen());
locMast.setIoTime(now);
locMast.setModiTime(now);
if (!locMastService.updateById(locMast)) {
@@ -299,6 +300,7 @@
if (locMast.getLocSts().equals("R")) {
locMast.setLocSts("O");
locMast.setBarcode("");
+ locMast.setFrozen(0);
locMast.setModiTime(now);
locMast.setIoTime(now);
if (!locMastService.updateById(locMast)) {
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 650e884..99aef08 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -21,6 +21,9 @@
private Double anfme;
+ private String memo;
+
+
public DetlDto() {
}
@@ -40,6 +43,7 @@
this.anfme = anfme;
}
+
public DetlDto(String orderNo, String matnr, String batch, Double anfme) {
this.orderNo = orderNo;
this.matnr = matnr;
@@ -47,6 +51,14 @@
this.anfme = anfme;
}
+ public DetlDto(String matnr, String batch, Double anfme, String memo) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.anfme = anfme;
+ this.memo = memo;
+ }
+
+
public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
for (DetlDto dto : detlDtos) {
if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetl.getBatch())) {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 5cd4bcd..3652900 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -138,6 +138,11 @@
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(now);
wrkMast.setModiTime(now);
+
+ if(waitPakins.size()>0) {
+ WaitPakin one = waitPakins.get(0);
+ wrkMast.setFrozen(one.getFrozen());
+ }
boolean res = wrkMastService.insert(wrkMast);
if (!res) {
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 98692a4..1bb10e3 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -27,6 +27,7 @@
// ,{field: 'ctnType', align: 'center',title: ''}
// ,{field: 'locSts', align: 'center',title: ''}
// ,{field: 'sheetNo', align: 'center',title: ''}
+ ,{field: 'frozen', align: 'center',title: '鍐荤粨鐘舵��'}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�', sort:true}
,{field: 'bay1', align: 'center',title: '鍒�', sort:true}
@@ -64,6 +65,7 @@
pageSize: 'limit'
},
parseData: function (res) {
+ console.log(res)
return {
'code': res.code,
'msg': res.msg,
--
Gitblit v1.9.1