From 19838a8bf458e94bed799363d11b35b517ab15df Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 18 十二月 2024 18:48:46 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 8
src/main/java/com/zy/asrs/controller/OrderPakinController.java | 4
src/main/java/com/zy/asrs/entity/OrderDetlPakin.java | 12 +
src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java | 92 ++++----
src/main/java/com/zy/asrs/controller/WaitPakinController.java | 2
src/main/java/com/zy/asrs/service/OrderDetlService.java | 14
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 10
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 22 +
src/main/java/com/zy/common/model/DetlDto.java | 99 +++++++-
src/main/java/com/zy/asrs/entity/LocMast.java | 4
src/main/java/com/zy/asrs/controller/OrderController.java | 4
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 4
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 12 +
src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java | 30 +-
src/main/java/com/zy/asrs/entity/OrderDetl.java | 12 +
src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java | 70 +++---
src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java | 14
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 18
src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java | 13
src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java | 12
src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java | 13
src/main/java/com/zy/common/model/TaskDto.java | 4
src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java | 6
src/main/java/com/zy/common/model/LocDto.java | 4
src/main/resources/mapper/OrderDetlPakinMapper.xml | 7
src/main/resources/mapper/OrderDetlMapper.xml | 7
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 4
src/main/java/com/zy/asrs/service/OrderDetlPakinService.java | 14
src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java | 6
src/main/java/com/zy/asrs/entity/WaitPakin.java | 8
src/main/java/com/zy/asrs/entity/LocDetl.java | 4
src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java | 6
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 30 +-
src/main/resources/mapper/OrderDetlPakoutMapper.xml | 7
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 8
src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java | 30 +-
36 files changed, 373 insertions(+), 241 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 695f9c8..dba1319 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -154,7 +154,7 @@
for (OrderDetl orderDetl : param.getOrderDetlList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -207,7 +207,7 @@
for (OrderDetl orderDetl : param.getOrderDetlList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ OrderDetl item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakinController.java b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
index 7216971..ff76cd7 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakinController.java
@@ -154,7 +154,7 @@
for (OrderDetlPakin orderDetl : param.getOrderDetlPakinList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetlPakin item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ OrderDetlPakin item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -207,7 +207,7 @@
for (OrderDetlPakin orderDetl : param.getOrderDetlPakinList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetlPakin item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ OrderDetlPakin item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index ef55e64..3c878be 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -154,7 +154,7 @@
for (OrderDetlPakout orderDetl : param.getOrderDetlPakoutList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
@@ -207,7 +207,7 @@
for (OrderDetlPakout orderDetl : param.getOrderDetlPakoutList()) {
DetlDto dto = new DetlDto(orderDetl.getMatnr(), orderDetl.getBatch());
if (DetlDto.has(list, dto)) {
- OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch());
+ OrderDetlPakout item = orderDetlService.selectItem(order.getId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3());
item.setAnfme(item.getAnfme() + orderDetl.getAnfme());
if (!orderDetlService.updateById(item)) {
throw new CoolException("淇濆瓨璁㈠崟鏄庣粏妗ｅけ璐�");
diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinController.java b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
index 89bfc57..f6a89be 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinController.java
@@ -109,7 +109,7 @@
// if (!orderDetlService.decrease(entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getAnfme())) {
// return R.error("璁㈠崟鏁版嵁鍥炴粴澶辫触");
// }
- OrderInAndOutUtil.decrease(Boolean.TRUE, entity.getOrderNo(), entity.getMatnr(), entity.getBatch(), entity.getAnfme());
+ OrderInAndOutUtil.decrease(Boolean.TRUE, entity.getOrderNo(), entity.getMatnr(), entity.getBatch(),entity.getBrand(),entity.getStandby1(),entity.getStandby2(),entity.getStandby3(), entity.getAnfme());
}
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 58d036c..69cde55 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -302,14 +302,14 @@
}
public String getFrozen$() {
- if (null == this.frozen){ return null; }
+ if (null == this.frozen){ return "鏈喕缁�"; }
switch (this.frozen){
case 0:
return "鏈喕缁�";
case 1:
return "宸插喕缁�";
default:
- return null;
+ return "鏈喕缁�";
}
}
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 3103c4b..ffca642 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -310,14 +310,14 @@
}
public String getFrozen$() {
- if (null == this.frozen){ return null; }
+ if (null == this.frozen){ return "鏈喕缁�"; }
switch (this.frozen){
case 0:
return "鏈喕缁�";
case 1:
return "宸插喕缁�";
default:
- return null;
+ return "鏈喕缁�";
}
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index e8c1229..c463eba 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -540,6 +540,18 @@
return "鏈畬鎴�";
}
+ public boolean beSimilar(OrderDetl orderDetl){
+ return (
+ this.orderNo.equals(orderDetl.getOrderNo())
+ && this.matnr.equals(orderDetl.getMatnr())
+ && this.batch.equals(orderDetl.getBatch())
+ && this.brand.equals(orderDetl.getBrand())
+ && this.standby1.equals(orderDetl.getStandby1())
+ && this.standby2.equals(orderDetl.getStandby2())
+ && this.standby3.equals(orderDetl.getStandby3())
+ );
+ }
+
public String getPakinPakoutStatus$(){
if (Cools.isEmpty(this.pakinPakoutStatus)) return null;
switch (this.pakinPakoutStatus){
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
index 145ce2b..13d9e75 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -504,6 +504,18 @@
return "鏈畬鎴�";
}
+ public boolean beSimilar(OrderDetlPakin orderDetlPakin){
+ return (
+ this.orderNo.equals(orderDetlPakin.getOrderNo())
+ && this.matnr.equals(orderDetlPakin.getMatnr())
+ && this.batch.equals(orderDetlPakin.getBatch())
+ && this.brand.equals(orderDetlPakin.getBrand())
+ && this.standby1.equals(orderDetlPakin.getStandby1())
+ && this.standby2.equals(orderDetlPakin.getStandby2())
+ && this.standby3.equals(orderDetlPakin.getStandby3())
+ );
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 3149f50..95304a4 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -505,6 +505,18 @@
return "鏈畬鎴�";
}
+ public boolean beSimilar(OrderDetlPakout orderDetlPakout){
+ return (
+ this.orderNo.equals(orderDetlPakout.getOrderNo())
+ && this.matnr.equals(orderDetlPakout.getMatnr())
+ && this.batch.equals(orderDetlPakout.getBatch())
+ && this.brand.equals(orderDetlPakout.getBrand())
+ && this.standby1.equals(orderDetlPakout.getStandby1())
+ && this.standby2.equals(orderDetlPakout.getStandby2())
+ && this.standby3.equals(orderDetlPakout.getStandby3())
+ );
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 799833a..98c9dfc 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -50,7 +50,7 @@
private String color;
@ApiModelProperty(value= "鍝佺墝")
- private String brand;
+ private String brand = "";
@ApiModelProperty(value= "鍗曚綅")
private String unit;
@@ -156,19 +156,19 @@
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private String standby1;
+ private String standby1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private String standby2;
+ private String standby2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private String standby3;
+ private String standby3 = "";
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
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 d1d5cfd..62ae6b4 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -26,10 +26,14 @@
public static class CombMat {
// 鐗╂枡缂栧彿
- private String matnr;
+ private String matnr = "";
// 搴忓垪鐮�
- private String batch;
+ private String batch = "";
+ private String brand = "";
+ private String standby1 = "";
+ private String standby2 = "";
+ private String standby3 = "";
// 鐗╂枡鏁伴噺
private Double anfme;
diff --git a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
index 674ae15..0cd95cb 100644
--- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -27,6 +27,10 @@
// 搴忓垪鐮�
private String batch;
+ private String brand = "";
+ private String standby1 = "";
+ private String standby2 = "";
+ private String standby3 = "";
// 鐗╂枡鏁伴噺
private Double anfme;
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
index 51c99ad..4b95a4f 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlMapper.java
@@ -13,9 +13,9 @@
@Repository
public interface OrderDetlMapper extends BaseMapper<OrderDetl> {
- OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);
+ OrderDetl selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3);
- OrderDetl selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch);
+ OrderDetl selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3);
List<OrderDetl> selectWorkingDetls(Long orderId);
@@ -23,15 +23,16 @@
Integer getPakoutPageCount(Map<String, Object> map);
- int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("qty")Double qty);
- int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("qty")Double qty);
int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);
int addToLogTable(OrderDetl orderDetl);
- int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("qty")Double qty);
- int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty);
+ int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("workQty")Double workQty);
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java
index 6b1b15c..695a990 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlPakinMapper.java
@@ -13,9 +13,9 @@
@Repository
public interface OrderDetlPakinMapper extends BaseMapper<OrderDetlPakin> {
- OrderDetlPakin selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);
+ OrderDetlPakin selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3);
- OrderDetlPakin selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch);
+ OrderDetlPakin selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3);
List<OrderDetlPakin> selectWorkingDetls(Long orderId);
@@ -23,15 +23,15 @@
Integer getPakoutPageCount(Map<String, Object> map);
- int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("qty")Double qty);
- int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("qty")Double qty);
int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);
int addToLogTable(OrderDetlPakin orderDetl);
- int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("qty")Double qty);
- int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty);
+ int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("workQty")Double workQty);
}
diff --git a/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java b/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java
index 7e4d8b1..115dd38 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderDetlPakoutMapper.java
@@ -13,9 +13,9 @@
@Repository
public interface OrderDetlPakoutMapper extends BaseMapper<OrderDetlPakout> {
- OrderDetlPakout selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch);
+ OrderDetlPakout selectItem(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3);
- OrderDetlPakout selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch);
+ OrderDetlPakout selectItemByOrderNo(@Param("orderNo") String orderNo, @Param("matnr") String matnr, @Param("batch") String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3);
List<OrderDetlPakout> selectWorkingDetls(Long orderId);
@@ -23,15 +23,16 @@
Integer getPakoutPageCount(Map<String, Object> map);
- int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ int increase(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("qty")Double qty);
- int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ int decrease(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("qty")Double qty);
int modifyStatus(@Param("orderId") Long orderId, @Param("status")Integer status);
int addToLogTable(OrderDetlPakout orderDetl);
- int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("qty")Double qty);
+ int increaseQtyByOrderNo(@Param("orderNo")String orderNo, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("qty")Double qty);
- int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("workQty")Double workQty);
+ int increaseWorkQty(@Param("orderId")Long orderId, @Param("matnr")String matnr, @Param("batch")String batch, @Param("brand")String brand, @Param("standby1")String standby1, @Param("standby2")String standby2, @Param("standby3")String standby3, @Param("workQty")Double workQty);
+
}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java b/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
index 44c975a..e8ba7fb 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlPakinService.java
@@ -12,21 +12,21 @@
Page<OrderDetlPakin> getPakoutPage(Page<OrderDetlPakin> page);
- OrderDetlPakin selectItem(Long orderId, String matnr, String batch);
+ OrderDetlPakin selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3);
- OrderDetlPakin selectItem(String orderNo, String matnr, String batch);
+ OrderDetlPakin selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3);
- OrderDetlPakin findByLook(List<OrderDetlPakin> orderDetls, Long orderId, String matnr, String batch);
+ OrderDetlPakin findByLook(List<OrderDetlPakin> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3);
- boolean increase(Long orderId, String matnr, String batch, Double qty);
+ boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty);
- boolean decrease(String orderNo, String matnr, String batch, Double qty);
+ boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty);
boolean modifyStatus(Long orderId, Integer status);
boolean addToLogTable(OrderDetlPakin orderDetl);
- boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty);
+ boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty);
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
@@ -36,5 +36,5 @@
* @param workQty
* @return
*/
- boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
+ boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty);
}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java b/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
index ba2d213..49a2e0f 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlPakoutService.java
@@ -12,21 +12,21 @@
Page<OrderDetlPakout> getPakoutPage(Page<OrderDetlPakout> page);
- OrderDetlPakout selectItem(Long orderId, String matnr, String batch);
+ OrderDetlPakout selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3);
- OrderDetlPakout selectItem(String orderNo, String matnr, String batch);
+ OrderDetlPakout selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3);
- OrderDetlPakout findByLook(List<OrderDetlPakout> orderDetls, Long orderId, String matnr, String batch);
+ OrderDetlPakout findByLook(List<OrderDetlPakout> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3);
- boolean increase(Long orderId, String matnr, String batch, Double qty);
+ boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty);
- boolean decrease(String orderNo, String matnr, String batch, Double qty);
+ boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty);
boolean modifyStatus(Long orderId, Integer status);
boolean addToLogTable(OrderDetlPakout orderDetl);
- boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty);
+ boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty);
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
@@ -36,5 +36,5 @@
* @param workQty
* @return
*/
- boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
+ boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty);
}
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index ecf08d2..45eef85 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -12,21 +12,21 @@
Page<OrderDetl> getPakoutPage(Page<OrderDetl> page);
- OrderDetl selectItem(Long orderId, String matnr, String batch);
+ OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3);
- OrderDetl selectItem(String orderNo, String matnr, String batch);
+ OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3);
- OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch);
+ OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3);
- boolean increase(Long orderId, String matnr, String batch, Double qty);
+ boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty);
- boolean decrease(String orderNo, String matnr, String batch, Double qty);
+ boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty);
boolean modifyStatus(Long orderId, Integer status);
boolean addToLogTable(OrderDetl orderDetl);
- boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty);
+ boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty);
/**
* 鍏ュ嚭搴撲换鍔＄敓鎴愭椂锛屾洿鏂板崟鎹〃涓綔涓氭暟閲�
@@ -36,5 +36,5 @@
* @param workQty
* @return
*/
- boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
+ boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty);
}
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 8557c0f..b728a10 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -117,9 +117,9 @@
// 鐢熸垚鍏ュ簱閫氱煡妗�
List<DetlDto> detlDtos = new ArrayList<>();
param.getCombMats().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(), elem.getAnfme());
if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
+ DetlDto one = DetlDto.findDto(detlDtos, detlDto);
assert one != null;
one.setAnfme(one.getAnfme() + detlDto.getAnfme());
} else {
@@ -161,7 +161,7 @@
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
// OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), elem.getMatnr(), elem.getBatch());
- OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch());
+ OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3());
if (elem.getAnfme() > orderDetl.getEnableQty()) {
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
@@ -169,10 +169,10 @@
// if (!orderDetlService.increaseWorkQty(order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme())) {
// throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
// }
- OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE,order.getId(), elem.getMatnr(), elem.getBatch(), elem.getAnfme());
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+ OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE,order.getId(), elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(), elem.getAnfme());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(), elem.getAnfme());
if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
+ DetlDto one = DetlDto.findDto(detlDtos, detlDto);
assert one != null;
one.setAnfme(one.getAnfme() + detlDto.getAnfme());
} else {
@@ -373,10 +373,12 @@
}
Mat analyse = MatUtils.analyseMat(elem.getMatnr());
// 鏉＄爜銆佺墿鏂欎唬鐮併�佸簭鍒楀彿銆佹暟閲�
- DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),analyse.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(), elem.getAnfme());
+
+// DetlDto detlDto = new DetlDto(elem.getMatnr(), analyse.getMatnr(), analyse.getBarcode(), elem.getAnfme());
// DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto one = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
+ DetlDto one = DetlDto.findDto(detlDtos, detlDto);
assert one != null;
one.setAnfme(one.getAnfme() + detlDto.getAnfme());
} else {
@@ -459,7 +461,7 @@
// 淇敼浣滀笟鏁伴噺 ----------------------------------------
// 璁㈠崟鏄庣粏鏁伴噺鏍￠獙
// OrderDetl orderDetl = orderDetlService.selectItem(order.getId(), detlDto.getMatnr(), detlDto.getBatch());
- OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), detlDto.getMatnr(), detlDto.getBatch());
+ OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.TRUE, order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3());
if (detlDto.getAnfme() > orderDetl.getEnableQty()) {
throw new CoolException(orderDetl.getMatnr() + "鍏ュ簱鏁伴噺涓嶅悎娉�");
}
@@ -467,7 +469,7 @@
// if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
// throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
// }
- OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE,order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme());
+ OrderInAndOutUtil.increaseWorkQty(Boolean.TRUE,order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(), detlDto.getAnfme());
// 淇濆瓨鍏ュ簱閫氱煡妗�
Mat mat = matService.selectByMatnr(detlDto.getMatnr());
if (Cools.isEmpty(mat)) {
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index dbf3c3a..50da2d4 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -102,9 +102,9 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(), detail.getAnfme());
if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
+ DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
@@ -251,9 +251,9 @@
List<DetlDto> list = new ArrayList<>();
List<DetlDto> orderDetails = param.getOrderDetails();
for (DetlDto detail : orderDetails) {
- DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(), detail.getAnfme());
+ DetlDto dto = new DetlDto(detail.getMatnr(), detail.getBatch(),detail.getBrand(),detail.getStandby1(),detail.getStandby2(),detail.getStandby3(), detail.getAnfme());
if (DetlDto.has(list, dto)) {
- DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch());
+ DetlDto detlDto = DetlDto.find(list, dto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + detail.getAnfme());
} else {
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java
index a0b0cf2..887bdac 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakinServiceImpl.java
@@ -27,19 +27,19 @@
}
@Override
- public OrderDetlPakin selectItem(Long orderId, String matnr, String batch) {
- return this.baseMapper.selectItem(orderId, matnr, batch);
+ public OrderDetlPakin selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
+ return this.baseMapper.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3);
}
@Override
- public OrderDetlPakin selectItem(String orderNo, String matnr, String batch) {
- return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
+ public OrderDetlPakin selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
+ return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3);
}
@Override
- public OrderDetlPakin findByLook(List<OrderDetlPakin> orderDetls, Long orderId, String matnr, String batch) {
+ public OrderDetlPakin findByLook(List<OrderDetlPakin> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
for (OrderDetlPakin orderDetl : orderDetls) {
- if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr)) {
+ if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr) && orderDetl.getBrand().equals(brand) && orderDetl.getStandby1().equals(standby1) && orderDetl.getStandby2().equals(standby2) && orderDetl.getStandby3().equals(standby3)) {
if (Cools.eq(batch, orderDetl.getBatch())) {
return orderDetl;
}
@@ -49,15 +49,15 @@
}
@Override
- public boolean increase(Long orderId, String matnr, String batch, Double qty) {
- return this.baseMapper.increase(orderId, matnr, batch, qty) > 0;
+ public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
+ return this.baseMapper.increase(orderId, matnr, batch,brand,standby1,standby2,standby3, qty) > 0;
}
@Override
- public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
- int decrease = this.baseMapper.decrease(orderNo, matnr, batch, qty);
+ public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
+ int decrease = this.baseMapper.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty);
if (decrease == 0) {
- return this.baseMapper.decrease(orderNo, matnr, null, qty) > 0;
+ return this.baseMapper.decrease(orderNo, matnr, "",brand,standby1,standby2,standby3, qty) > 0;
} else {
return true;
}
@@ -74,8 +74,8 @@
}
@Override
- public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
- return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, qty) > 0;
+ public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
+ return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty) > 0;
}
/**
@@ -87,7 +87,7 @@
* @return
*/
@Override
- public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
- return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty) > 0;
+ public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty) {
+ return this.baseMapper.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3, workQty) > 0;
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
index 1faf2da..151b018 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlPakoutServiceImpl.java
@@ -27,19 +27,19 @@
}
@Override
- public OrderDetlPakout selectItem(Long orderId, String matnr, String batch) {
- return this.baseMapper.selectItem(orderId, matnr, batch);
+ public OrderDetlPakout selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
+ return this.baseMapper.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3);
}
@Override
- public OrderDetlPakout selectItem(String orderNo, String matnr, String batch) {
- return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
+ public OrderDetlPakout selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
+ return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3);
}
@Override
- public OrderDetlPakout findByLook(List<OrderDetlPakout> orderDetls, Long orderId, String matnr, String batch) {
+ public OrderDetlPakout findByLook(List<OrderDetlPakout> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
for (OrderDetlPakout orderDetl : orderDetls) {
- if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr)) {
+ if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr) && orderDetl.getBrand().equals(brand) && orderDetl.getStandby1().equals(standby1) && orderDetl.getStandby2().equals(standby2) && orderDetl.getStandby3().equals(standby3)) {
if (Cools.eq(batch, orderDetl.getBatch())) {
return orderDetl;
}
@@ -49,15 +49,15 @@
}
@Override
- public boolean increase(Long orderId, String matnr, String batch, Double qty) {
- return this.baseMapper.increase(orderId, matnr, batch, qty) > 0;
+ public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
+ return this.baseMapper.increase(orderId, matnr, batch,brand,standby1,standby2,standby3, qty) > 0;
}
@Override
- public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
- int decrease = this.baseMapper.decrease(orderNo, matnr, batch, qty);
+ public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
+ int decrease = this.baseMapper.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty);
if (decrease == 0) {
- return this.baseMapper.decrease(orderNo, matnr, null, qty) > 0;
+ return this.baseMapper.decrease(orderNo, matnr, "",brand,standby1,standby2,standby3, qty) > 0;
} else {
return true;
}
@@ -74,8 +74,8 @@
}
@Override
- public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
- return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, qty) > 0;
+ public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
+ return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty) > 0;
}
/**
@@ -87,7 +87,7 @@
* @return
*/
@Override
- public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
- return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty) > 0;
+ public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty) {
+ return this.baseMapper.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3, workQty) > 0;
}
}
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 327edbb..dbab1fd 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -27,19 +27,19 @@
}
@Override
- public OrderDetl selectItem(Long orderId, String matnr, String batch) {
- return this.baseMapper.selectItem(orderId, matnr, batch);
+ public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
+ return this.baseMapper.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3);
}
@Override
- public OrderDetl selectItem(String orderNo, String matnr, String batch) {
- return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch);
+ public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
+ return this.baseMapper.selectItemByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3);
}
@Override
- public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) {
+ public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
for (OrderDetl orderDetl : orderDetls) {
- if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr)) {
+ if (orderDetl.getOrderId().equals(orderId) && orderDetl.getMatnr().equals(matnr) && orderDetl.getBrand().equals(brand) && orderDetl.getStandby1().equals(standby1) && orderDetl.getStandby2().equals(standby2) && orderDetl.getStandby3().equals(standby3)) {
if (Cools.eq(batch, orderDetl.getBatch())) {
return orderDetl;
}
@@ -49,15 +49,15 @@
}
@Override
- public boolean increase(Long orderId, String matnr, String batch, Double qty) {
- return this.baseMapper.increase(orderId, matnr, batch, qty) > 0;
+ public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
+ return this.baseMapper.increase(orderId, matnr, batch,brand,standby1,standby2,standby3, qty) > 0;
}
@Override
- public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
- int decrease = this.baseMapper.decrease(orderNo, matnr, batch, qty);
+ public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
+ int decrease = this.baseMapper.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty);
if (decrease == 0) {
- return this.baseMapper.decrease(orderNo, matnr, null, qty) > 0;
+ return this.baseMapper.decrease(orderNo, matnr, "",brand,standby1,standby2,standby3, qty) > 0;
} else {
return true;
}
@@ -74,8 +74,8 @@
}
@Override
- public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
- return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch, qty) > 0;
+ public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
+ return this.baseMapper.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty) > 0;
}
/**
@@ -87,7 +87,7 @@
* @return
*/
@Override
- public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
- return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty) > 0;
+ public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty) {
+ return this.baseMapper.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3, workQty) > 0;
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
index a6e3740..a544e95 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderPakinServiceImpl.java
@@ -116,7 +116,7 @@
try {
List<DetlDto> detlDtos = new ArrayList<>();
wrkDetls.forEach(wrkDetl -> {
- detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
+ detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(), wrkDetl.getAnfme()));
});
String orderNo = "HAND" + snowflakeIdWorker.nextId();
if (pakin) {
@@ -146,11 +146,11 @@
}
for (DetlDto detlDto : detlDtos) {
// 淇敼璁㈠崟鏄庣粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
index 7ff82a9..16e60da 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderPakoutServiceImpl.java
@@ -116,7 +116,7 @@
try {
List<DetlDto> detlDtos = new ArrayList<>();
wrkDetls.forEach(wrkDetl -> {
- detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
+ detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(), wrkDetl.getAnfme()));
});
String orderNo = "HAND" + snowflakeIdWorker.nextId();
if (pakin) {
@@ -146,11 +146,11 @@
}
for (DetlDto detlDto : detlDtos) {
// 淇敼璁㈠崟鏄庣粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index 1ad3354..2ec0b86 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -116,7 +116,7 @@
try {
List<DetlDto> detlDtos = new ArrayList<>();
wrkDetls.forEach(wrkDetl -> {
- detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme()));
+ detlDtos.add(new DetlDto(wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(), wrkDetl.getAnfme()));
});
String orderNo = "HAND" + snowflakeIdWorker.nextId();
if (pakin) {
@@ -146,11 +146,11 @@
}
for (DetlDto detlDto : detlDtos) {
// 淇敼璁㈠崟鏄庣粏鏁伴噺
- if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ if (!orderDetlService.increase(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁鏄庣粏鏁伴噺澶辫触");
}
// 淇敼璁㈠崟浣滀笟鏁伴噺
- if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(), detlDto.getAnfme())) {
+ if (!orderDetlService.increaseWorkQty(order.getId(), detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3(), detlDto.getAnfme())) {
throw new CoolException("淇敼鍗曟嵁浣滀笟鏁伴噺澶辫触");
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 294a624..d59bab5 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -140,9 +140,9 @@
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
List<DetlDto> detlDtos = new ArrayList<>();
param.getList().forEach(elem -> {
- DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme());
+ DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(), elem.getAnfme());
if (DetlDto.has(detlDtos, detlDto)) {
- DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch());
+ DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch(),detlDto.getBrand(),detlDto.getStandby1(),detlDto.getStandby2(),detlDto.getStandby3());
assert detlDto1 != null;
detlDto1.setAnfme(detlDto1.getAnfme() + detlDto.getAnfme());
} else {
@@ -424,7 +424,7 @@
for (LocDto locDto : taskDto.getLocDtos()) {
if (locDto.getAnfme()==null || locDto.getAnfme() <= 0.0D) { continue; }
// OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
- OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
+ OrderDetl orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch(),locDto.getBrand(),locDto.getStandby1(),locDto.getStandby2(),locDto.getStandby3());
// if (orderDetl == null) {
//// orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
// orderDetl = OrderInAndOutUtil.selectItem(Boolean.FALSE, locDto.getOrderNo(), locDto.getMatnr(), null);
@@ -450,7 +450,7 @@
// throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
// }
// orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
- OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE,orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme());
+ OrderInAndOutUtil.increaseWorkQty(Boolean.FALSE,orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(),orderDetl.getBrand(),orderDetl.getStandby1(),orderDetl.getStandby2(),orderDetl.getStandby3(), locDto.getAnfme());
OrderInAndOutUtil.updateOrder(Boolean.FALSE,orderDetl.getOrderId(), 2L, userId);
}
// 淇敼搴撲綅鐘舵��: F.鍦ㄥ簱 ====>>> R.鍑哄簱棰勭害/P.鎷ｆ枡/鐩樼偣/骞舵澘鍑哄簱涓�
@@ -1018,7 +1018,7 @@
// if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
// throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
// }
- OrderInAndOutUtil.decrease(Boolean.FALSE,wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme());
+ OrderInAndOutUtil.decrease(Boolean.FALSE,wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(), wrkDetl.getAnfme());
//淇敼璁㈠崟涓昏〃鐘舵��,娌℃湁浣滀笟鏁伴噺鏃舵墠鍙互淇敼
boolean flag = true;
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 397ca6e..7c29ba0 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -119,14 +119,14 @@
}
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3());
if (orderDetlPakin==null){
- orderDetlPakin = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
+ orderDetlPakin = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3());
}
try {
if(!Cools.isEmpty(orderDetlPakin)){
if(!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetlPakin.getBatch(),wrkDetl.getAnfme())){
+ orderDetlPakin.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),wrkDetl.getAnfme())){
// exceptionHandle("鍏ㄦ澘鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
// wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -170,14 +170,14 @@
}
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3());
if (orderDetlPakin==null){
- orderDetlPakin = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
+ orderDetlPakin = orderDetlPakinService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3());
}
try {
if(!Cools.isEmpty(orderDetlPakin)){
if(!orderDetlPakinService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetlPakin.getBatch(),wrkDetl.getAnfme())){
+ orderDetlPakin.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),wrkDetl.getAnfme())){
// exceptionHandle("鎷ｆ枡鍏ュ簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
// wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -353,14 +353,14 @@
}
for (WrkDetl wrkDetl : wrkDetls101) {
// 鏇存柊璁㈠崟瀹屾垚鏁伴噺
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch());
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3());
if (orderDetlPakout==null){
- orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), null);
+ orderDetlPakout = orderDetlPakoutService.selectItem(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3());
}
try {
if(!Cools.isEmpty(orderDetlPakout)){
if(!orderDetlPakoutService.increaseQtyByOrderNo(wrkDetl.getOrderNo(), wrkDetl.getMatnr(),
- orderDetlPakout.getBatch(),wrkDetl.getAnfme())){
+ orderDetlPakout.getBatch(),wrkDetl.getBrand(),wrkDetl.getStandby1(),wrkDetl.getStandby2(),wrkDetl.getStandby3(),wrkDetl.getAnfme())){
// exceptionHandle("鍏ㄦ澘鍑哄簱 ===>> 鏇存柊璁㈠崟瀹屾垚鏁伴噺澶辫触锛沎workNo={0}],[locNo={1}]",
// wrkMast.getWrkNo(), wrkMast.getLocNo());
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
diff --git a/src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java b/src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java
index a4d217c..862eb11 100644
--- a/src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java
+++ b/src/main/java/com/zy/asrs/utils/OrderInAndOutUtil.java
@@ -115,23 +115,23 @@
case SELECT_ORDER_MOVE_STATUS_INITIAL:
return casual.getDeclaredMethod(OrderMethodVo.SELECT_ORDER_MOVE_STATUS_INITIAL.getCode());
case SELECT_ITEM1:
- return casual.getDeclaredMethod(OrderMethodVo.SELECT_ITEM1.getCode(), Long.class,String.class,String.class);
+ return casual.getDeclaredMethod(OrderMethodVo.SELECT_ITEM1.getCode(), Long.class,String.class,String.class,String.class,String.class,String.class,String.class);
case SELECT_ITEM2:
- return casual.getDeclaredMethod(OrderMethodVo.SELECT_ITEM2.getCode(), String.class,String.class,String.class);
+ return casual.getDeclaredMethod(OrderMethodVo.SELECT_ITEM2.getCode(), String.class,String.class,String.class,String.class,String.class,String.class,String.class);
case FIND_BY_LOOK:
- return casual.getDeclaredMethod(OrderMethodVo.FIND_BY_LOOK.getCode(), List.class, Long.class,String.class,String.class);
+ return casual.getDeclaredMethod(OrderMethodVo.FIND_BY_LOOK.getCode(), List.class, Long.class,String.class,String.class,String.class,String.class,String.class,String.class);
case INCREASE:
- return casual.getDeclaredMethod(OrderMethodVo.INCREASE.getCode(), Long.class,String.class,String.class,Double.class);
+ return casual.getDeclaredMethod(OrderMethodVo.INCREASE.getCode(), Long.class,String.class,String.class,String.class,String.class,String.class,String.class,Double.class);
case DECREASE:
- return casual.getDeclaredMethod(OrderMethodVo.DECREASE.getCode(), String.class,String.class,String.class,Double.class);
+ return casual.getDeclaredMethod(OrderMethodVo.DECREASE.getCode(), String.class,String.class,String.class,String.class,String.class,String.class,String.class,Double.class);
case MODIFY_STATUS:
return casual.getDeclaredMethod(OrderMethodVo.MODIFY_STATUS.getCode(), Long.class,Integer.class);
case ADD_TO_LOG_TABLE_ORDERDETL:
return casual.getDeclaredMethod(OrderMethodVo.ADD_TO_LOG_TABLE_ORDERDETL.getCode(), OrderDetl.class);
case INCREASE_QTY_BY_ORDER_NO:
- return casual.getDeclaredMethod(OrderMethodVo.INCREASE_QTY_BY_ORDER_NO.getCode(), String.class,String.class,String.class,Double.class);
+ return casual.getDeclaredMethod(OrderMethodVo.INCREASE_QTY_BY_ORDER_NO.getCode(), String.class,String.class,String.class,String.class,String.class,String.class,String.class,Double.class);
case INCREASE_WORKING_QTY:
- return casual.getDeclaredMethod(OrderMethodVo.INCREASE_WORKING_QTY.getCode(), Long.class,String.class,String.class,Double.class);
+ return casual.getDeclaredMethod(OrderMethodVo.INCREASE_WORKING_QTY.getCode(), Long.class,String.class,String.class,String.class,String.class,String.class,String.class,Double.class);
}
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
@@ -521,90 +521,90 @@
}
}
- public static OrderDetl selectItem(boolean sign,Long orderId, String matnr, String batch){
+ public static OrderDetl selectItem(boolean sign,Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3){
try{
- Object invoke = implement(OrderMethodVo.SELECT_ITEM1).invoke(getOrderInAndOutType(sign), orderId, matnr, batch);
+ Object invoke = implement(OrderMethodVo.SELECT_ITEM1).invoke(getOrderInAndOutType(sign), orderId, matnr, batch,brand,standby1,standby2,standby3);
return aOrderDetl(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static OrderDetl selectItem(String sign,Long orderId, String matnr, String batch){
+ public static OrderDetl selectItem(String sign,Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3){
try{
- Object invoke = implement(OrderMethodVo.SELECT_ITEM1).invoke(getOrderInAndOutType(sign), orderId, matnr, batch);
+ Object invoke = implement(OrderMethodVo.SELECT_ITEM1).invoke(getOrderInAndOutType(sign), orderId, matnr, batch,brand,standby1,standby2,standby3);
return aOrderDetl(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static OrderDetl selectItem(boolean sign,String orderNo, String matnr, String batch){
+ public static OrderDetl selectItem(boolean sign,String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3){
try{
- Object invoke = implement(OrderMethodVo.SELECT_ITEM2).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch);
+ Object invoke = implement(OrderMethodVo.SELECT_ITEM2).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch,brand,standby1,standby2,standby3);
return aOrderDetl(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static OrderDetl selectItem(String sign,String orderNo, String matnr, String batch){
+ public static OrderDetl selectItem(String sign,String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3){
try{
- Object invoke = implement(OrderMethodVo.SELECT_ITEM2).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch);
+ Object invoke = implement(OrderMethodVo.SELECT_ITEM2).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch,brand,standby1,standby2,standby3);
return aOrderDetl(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static OrderDetl findByLook(boolean sign,List<OrderDetl> orderDetls, Long orderId, String matnr, String batch){
+ public static OrderDetl findByLook(boolean sign,List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3){
try{
- Object invoke = implement(OrderMethodVo.FIND_BY_LOOK).invoke(getOrderInAndOutType(sign), orderDetls, orderId, matnr, batch);
+ Object invoke = implement(OrderMethodVo.FIND_BY_LOOK).invoke(getOrderInAndOutType(sign), orderDetls, orderId, matnr, batch,brand,standby1,standby2,standby3);
return aOrderDetl(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static OrderDetl findByLook(String sign,List<OrderDetl> orderDetls, Long orderId, String matnr, String batch){
+ public static OrderDetl findByLook(String sign,List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3){
try{
- Object invoke = implement(OrderMethodVo.FIND_BY_LOOK).invoke(getOrderInAndOutType(sign), orderDetls, orderId, matnr, batch);
+ Object invoke = implement(OrderMethodVo.FIND_BY_LOOK).invoke(getOrderInAndOutType(sign), orderDetls, orderId, matnr, batch,brand,standby1,standby2,standby3);
return aOrderDetl(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static boolean increase(boolean sign,Long orderId, String matnr, String batch, Double qty){
+ public static boolean increase(boolean sign,Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty){
try{
- Object invoke = implement(OrderMethodVo.INCREASE).invoke(getOrderInAndOutType(sign), orderId, matnr, batch, qty);
+ Object invoke = implement(OrderMethodVo.INCREASE).invoke(getOrderInAndOutType(sign), orderId, matnr, batch,brand,standby1,standby2,standby3, qty);
return aBoolean(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static boolean increase(String sign,Long orderId, String matnr, String batch, Double qty){
+ public static boolean increase(String sign,Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty){
try{
- Object invoke = implement(OrderMethodVo.INCREASE).invoke(getOrderInAndOutType(sign), orderId, matnr, batch, qty);
+ Object invoke = implement(OrderMethodVo.INCREASE).invoke(getOrderInAndOutType(sign), orderId, matnr, batch,brand,standby1,standby2,standby3, qty);
return aBoolean(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static boolean decrease(boolean sign,String orderNo, String matnr, String batch, Double qty){
+ public static boolean decrease(boolean sign,String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty){
try{
- Object invoke = implement(OrderMethodVo.DECREASE).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch, qty);
+ Object invoke = implement(OrderMethodVo.DECREASE).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch,brand,standby1,standby2,standby3, qty);
return aBoolean(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static boolean decrease(String sign,String orderNo, String matnr, String batch, Double qty){
+ public static boolean decrease(String sign,String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty){
try{
- Object invoke = implement(OrderMethodVo.DECREASE).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch, qty);
+ Object invoke = implement(OrderMethodVo.DECREASE).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch,brand,standby1,standby2,standby3, qty);
return aBoolean(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
@@ -647,36 +647,36 @@
}
}
- public static boolean increaseQtyByOrderNo(boolean sign,String orderNo, String matnr, String batch, Double qty){
+ public static boolean increaseQtyByOrderNo(boolean sign,String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty){
try{
- Object invoke = implement(OrderMethodVo.INCREASE_QTY_BY_ORDER_NO).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch, qty);
+ Object invoke = implement(OrderMethodVo.INCREASE_QTY_BY_ORDER_NO).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch,brand,standby1,standby2,standby3, qty);
return aBoolean(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static boolean increaseQtyByOrderNo(String sign,String orderNo, String matnr, String batch, Double qty){
+ public static boolean increaseQtyByOrderNo(String sign,String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty){
try{
- Object invoke = implement(OrderMethodVo.INCREASE_QTY_BY_ORDER_NO).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch, qty);
+ Object invoke = implement(OrderMethodVo.INCREASE_QTY_BY_ORDER_NO).invoke(getOrderInAndOutType(sign), orderNo, matnr, batch,brand,standby1,standby2,standby3, qty);
return aBoolean(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static boolean increaseWorkQty(boolean sign,Long orderId, String matnr, String batch, Double workQty){
+ public static boolean increaseWorkQty(boolean sign,Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty){
try{
- Object invoke = implement(OrderMethodVo.INCREASE_WORKING_QTY).invoke(getOrderInAndOutType(sign), orderId, matnr, batch, workQty);
+ Object invoke = implement(OrderMethodVo.INCREASE_WORKING_QTY).invoke(getOrderInAndOutType(sign), orderId, matnr, batch,brand,standby1,standby2,standby3, workQty);
return aBoolean(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
}
}
- public static boolean increaseWorkQty(String sign,Long orderId, String matnr, String batch, Double workQty){
+ public static boolean increaseWorkQty(String sign,Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty){
try{
- Object invoke = implement(OrderMethodVo.INCREASE_WORKING_QTY).invoke(getOrderInAndOutType(sign), orderId, matnr, batch, workQty);
+ Object invoke = implement(OrderMethodVo.INCREASE_WORKING_QTY).invoke(getOrderInAndOutType(sign), orderId, matnr, batch,brand,standby1,standby2,standby3, workQty);
return aBoolean(invoke);
} catch (Exception e) {
throw new CoolException(e.getCause().getMessage());
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index 650e884..7e719d2 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -2,6 +2,8 @@
import com.core.common.Cools;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.OrderDetlPakin;
+import com.zy.asrs.entity.OrderDetlPakout;
import lombok.Data;
import java.util.List;
@@ -17,11 +19,34 @@
private String matnr;
- private String batch;
+ private String batch = "";
+ private String brand = "";
+ private String standby1 = "";
+ private String standby2 = "";
+ private String standby3 = "";
private Double anfme;
public DetlDto() {
+ }
+
+ public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double anfme) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.brand = brand;
+ this.standby1 = standby1;
+ this.standby2 = standby2;
+ this.standby3 = standby3;
+ this.anfme = anfme;
+ }
+
+ public DetlDto(String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
+ this.matnr = matnr;
+ this.batch = batch;
+ this.brand = brand;
+ this.standby1 = standby1;
+ this.standby2 = standby2;
+ this.standby3 = standby3;
}
public DetlDto(String matnr, Double anfme) {
@@ -49,16 +74,44 @@
public static boolean hasList(Set<DetlDto> detlDtos, OrderDetl orderDetl) {
for (DetlDto dto : detlDtos) {
- if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetl.getBatch())) {
- if (dto.getMatnr().equals(orderDetl.getMatnr())) {
- return true;
- }
- } else {
- if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetl.getBatch())) {
- if (dto.getMatnr().equals(orderDetl.getMatnr()) && dto.getBatch().equals(orderDetl.getBatch())) {
- return true;
- }
- }
+// if (Cools.isEmpty(dto.getBatch()) && Cools.isEmpty(orderDetl.getBatch())) {
+// if (dto.getMatnr().equals(orderDetl.getMatnr())) {
+// return true;
+// }
+// } else
+// {
+// if (!Cools.isEmpty(dto.getBatch()) && !Cools.isEmpty(orderDetl.getBatch())) {
+// if (dto.getMatnr().equals(orderDetl.getMatnr()) && dto.getBatch().equals(orderDetl.getBatch())) {
+// return true;
+// }
+ if (dto.getMatnr().equals(orderDetl.getMatnr()) && Cools.eq(dto.getBatch(), orderDetl.getBatch())
+ && Cools.eq(dto.getBrand(), orderDetl.getBrand()) && Cools.eq(dto.getStandby1(), orderDetl.getStandby1())
+ && Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())) {
+ return true;
+ }
+// }
+// }
+ }
+ return false;
+ }
+
+ public static boolean hasList(Set<DetlDto> detlDtos, OrderDetlPakin orderDetl) {
+ for (DetlDto dto : detlDtos) {
+ if (dto.getMatnr().equals(orderDetl.getMatnr()) && Cools.eq(dto.getBatch(), orderDetl.getBatch())
+ && Cools.eq(dto.getBrand(), orderDetl.getBrand()) && Cools.eq(dto.getStandby1(), orderDetl.getStandby1())
+ && Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public static boolean hasList(Set<DetlDto> detlDtos, OrderDetlPakout orderDetl) {
+ for (DetlDto dto : detlDtos) {
+ if (dto.getMatnr().equals(orderDetl.getMatnr()) && Cools.eq(dto.getBatch(), orderDetl.getBatch())
+ && Cools.eq(dto.getBrand(), orderDetl.getBrand()) && Cools.eq(dto.getStandby1(), orderDetl.getStandby1())
+ && Cools.eq(dto.getStandby2(), orderDetl.getStandby2()) && Cools.eq(dto.getStandby3(), orderDetl.getStandby3())) {
+ return true;
}
}
return false;
@@ -66,19 +119,37 @@
public static boolean has(List<DetlDto> detlDtos, DetlDto detlDto) {
for (DetlDto dto : detlDtos) {
- if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())) {
+ if (dto.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(dto.getBatch(), detlDto.getBatch())
+ && Cools.eq(dto.getBrand(), detlDto.getBrand()) && Cools.eq(dto.getStandby1(), detlDto.getStandby1())
+ && Cools.eq(dto.getStandby2(), detlDto.getStandby2()) && Cools.eq(dto.getStandby3(), detlDto.getStandby3())) {
return true;
}
}
return false;
}
- public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch) {
+ public static DetlDto find(List<DetlDto> detlDtos, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
if (Cools.isEmpty(matnr)) {
return null;
}
for (DetlDto detlDto : detlDtos) {
- if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())) {
+ if (matnr.equals(detlDto.getMatnr()) && Cools.eq(batch, detlDto.getBatch())
+ && brand.equals(detlDto.getBrand()) && standby1.equals(detlDto.getStandby1())
+ && standby2.equals(detlDto.getStandby2()) && standby3.equals(detlDto.getStandby3())) {
+ return detlDto;
+ }
+ }
+ return null;
+ }
+
+ public static DetlDto findDto(List<DetlDto> detlDtos,DetlDto detlDtoB) {
+ if (Cools.isEmpty(detlDtoB)) {
+ return null;
+ }
+ for (DetlDto detlDto : detlDtos) {
+ if (detlDtoB.getMatnr().equals(detlDto.getMatnr()) && Cools.eq(detlDtoB.getBatch(), detlDto.getBatch())
+ && detlDtoB.getBrand().equals(detlDto.getBrand()) && detlDtoB.getStandby1().equals(detlDto.getStandby1())
+ && detlDtoB.getStandby2().equals(detlDto.getStandby2()) && detlDtoB.getStandby3().equals(detlDto.getStandby3())) {
return detlDto;
}
}
diff --git a/src/main/java/com/zy/common/model/LocDto.java b/src/main/java/com/zy/common/model/LocDto.java
index 3fb9234..ed40834 100644
--- a/src/main/java/com/zy/common/model/LocDto.java
+++ b/src/main/java/com/zy/common/model/LocDto.java
@@ -19,6 +19,10 @@
private String maktx;
private String batch;
+ private String brand = "";
+ private String standby1 = "";
+ private String standby2 = "";
+ private String standby3 = "";
private String orderNo;
diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java
index 4ba8064..47c13f0 100644
--- a/src/main/java/com/zy/common/model/TaskDto.java
+++ b/src/main/java/com/zy/common/model/TaskDto.java
@@ -71,9 +71,9 @@
// 姹囨�讳笉鑰冭檻搴忓垪鐮�
List<DetlDto> detlDtos = new ArrayList<>();
for (LocDto locDto : this.getLocDtos()) {
- DetlDto dto = new DetlDto(locDto.getMatnr(), locDto.getBatch(), locDto.getAnfme());
+ DetlDto dto = new DetlDto(locDto.getMatnr(), locDto.getBatch(),locDto.getBrand(),locDto.getStandby1(),locDto.getStandby2(),locDto.getStandby3(), locDto.getAnfme());
if (DetlDto.has(detlDtos, dto)) {
- DetlDto detlDto = DetlDto.find(detlDtos, locDto.getMatnr(), dto.getBatch());
+ DetlDto detlDto = DetlDto.find(detlDtos, locDto.getMatnr(), dto.getBatch(),dto.getBrand(),dto.getStandby1(),dto.getStandby2(),dto.getStandby3());
assert detlDto != null;
detlDto.setAnfme(detlDto.getAnfme() + locDto.getAnfme());
} else {
diff --git a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
index 711d353..280d487 100644
--- a/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
+++ b/src/main/java/com/zy/common/model/enumUtils/OrderInAndOutType.java
@@ -144,30 +144,30 @@
}
@Transactional
- public OrderDetl selectItem(Long orderId, String matnr, String batch) {
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch);
+ public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3);
return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin);
}
@Transactional
- public OrderDetl selectItem(String orderNo, String matnr, String batch) {
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch);
+ public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3);
return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin);
}
@Transactional
- public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) {
+ public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
List<OrderDetlPakin> orderDetlPakins = OrderTransFormationUtil.transformationDetlListPakin(orderDetls);
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.findByLook(orderDetlPakins, orderId, matnr,batch);
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.findByLook(orderDetlPakins, orderId, matnr,batch,brand,standby1,standby2,standby3);
return OrderTransFormationUtil.transformationOrderDetlPakin(orderDetlPakin);
}
@Transactional
- public boolean increase(Long orderId, String matnr, String batch, Double qty) {
- return orderDetlPakinService.increase(orderId, matnr, batch, qty);
+ public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
+ return orderDetlPakinService.increase(orderId, matnr, batch,brand,standby1,standby2,standby3, qty);
}
@Transactional
- public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
- return orderDetlPakinService.decrease(orderNo, matnr, batch, qty);
+ public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
+ return orderDetlPakinService.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty);
}
@Transactional
public boolean modifyStatus(Long orderId, Integer status) {
@@ -179,12 +179,12 @@
return orderDetlPakinService.addToLogTable(orderDetlPakin);
}
@Transactional
- public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
- return orderDetlPakinService.increaseQtyByOrderNo(orderNo, matnr, batch, qty);
+ public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
+ return orderDetlPakinService.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty);
}
@Transactional
- public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
- return orderDetlPakinService.increaseWorkQty(orderId, matnr, batch, workQty);
+ public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty) {
+ return orderDetlPakinService.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3, workQty);
}
},
PAKOUT{
@@ -312,30 +312,30 @@
}
@Transactional
- public OrderDetl selectItem(Long orderId, String matnr, String batch) {
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch);
+ public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3);
return OrderTransFormationUtil.transformationOrderDetlPakout(orderDetlPakout);
}
@Transactional
- public OrderDetl selectItem(String orderNo, String matnr, String batch) {
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch);
+ public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3);
return OrderTransFormationUtil.transformationOrderDetlPakout(orderDetlPakout);
}
@Transactional
- public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) {
+ public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
List<OrderDetlPakout> orderDetlPakouts = OrderTransFormationUtil.transformationDetlListPakout(orderDetls);
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.findByLook(orderDetlPakouts, orderId, matnr,batch);
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.findByLook(orderDetlPakouts, orderId, matnr,batch,brand,standby1,standby2,standby3);
return OrderTransFormationUtil.transformationOrderDetlPakout(orderDetlPakout);
}
@Transactional
- public boolean increase(Long orderId, String matnr, String batch, Double qty) {
- return orderDetlPakoutService.increase(orderId, matnr, batch, qty);
+ public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
+ return orderDetlPakoutService.increase(orderId, matnr, batch,brand,standby1,standby2,standby3, qty);
}
@Transactional
- public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
- return orderDetlPakoutService.decrease(orderNo, matnr, batch, qty);
+ public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
+ return orderDetlPakoutService.decrease(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty);
}
@Transactional
public boolean modifyStatus(Long orderId, Integer status) {
@@ -347,12 +347,12 @@
return orderDetlPakoutService.addToLogTable(orderDetlPakout);
}
@Transactional
- public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
- return orderDetlPakoutService.increaseQtyByOrderNo(orderNo, matnr, batch, qty);
+ public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
+ return orderDetlPakoutService.increaseQtyByOrderNo(orderNo, matnr, batch,brand,standby1,standby2,standby3, qty);
}
@Transactional
- public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
- return orderDetlPakoutService.increaseWorkQty(orderId, matnr, batch, workQty);
+ public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty) {
+ return orderDetlPakoutService.increaseWorkQty(orderId, matnr, batch,brand,standby1,standby2,standby3, workQty);
}
@@ -471,29 +471,29 @@
}
@Transactional
- public OrderDetl selectItem(Long orderId, String matnr, String batch) {
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch);
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch);
+ public OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3);
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderId, matnr, batch,brand,standby1,standby2,standby3);
return OrderTransFormationUtil.transformationOrderDetl(orderDetlPakin,orderDetlPakout);
}
@Transactional
- public OrderDetl selectItem(String orderNo, String matnr, String batch) {
- OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch);
- OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch);
+ public OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
+ OrderDetlPakin orderDetlPakin = orderDetlPakinService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3);
+ OrderDetlPakout orderDetlPakout = orderDetlPakoutService.selectItem(orderNo, matnr, batch,brand,standby1,standby2,standby3);
return OrderTransFormationUtil.transformationOrderDetl(orderDetlPakin,orderDetlPakout);
}
@Transactional
- public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch) {
+ public OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3) {
throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�487");
}
@Transactional
- public boolean increase(Long orderId, String matnr, String batch, Double qty) {
+ public boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�491");
}
@Transactional
- public boolean decrease(String orderNo, String matnr, String batch, Double qty) {
+ public boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�495");
}
@Transactional
@@ -505,11 +505,11 @@
throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�503");
}
@Transactional
- public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty) {
+ public boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty) {
throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�507");
}
@Transactional
- public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty) {
+ public boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty) {
throw new CoolException("姝ゆ柟娉曟棤鐢紒璇峰ソ濂藉啓绋嬪簭锛侊紒锛�511");
}
},
@@ -553,23 +553,23 @@
public abstract Order selectOrderMoveStatusInitial();
- public abstract OrderDetl selectItem(Long orderId, String matnr, String batch);
+ public abstract OrderDetl selectItem(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3);
- public abstract OrderDetl selectItem(String orderNo, String matnr, String batch);
+ public abstract OrderDetl selectItem(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3);
- public abstract OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch);
+ public abstract OrderDetl findByLook(List<OrderDetl> orderDetls, Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3);
- public abstract boolean increase(Long orderId, String matnr, String batch, Double qty);
+ public abstract boolean increase(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty);
- public abstract boolean decrease(String orderNo, String matnr, String batch, Double qty);
+ public abstract boolean decrease(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty);
public abstract boolean modifyStatus(Long orderId, Integer status);
public abstract boolean addToLogTableOrderDetl(OrderDetl orderDetl);
- public abstract boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, Double qty);
+ public abstract boolean increaseQtyByOrderNo(String orderNo, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double qty);
- public abstract boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty);
+ public abstract boolean increaseWorkQty(Long orderId, String matnr, String batch, String brand, String standby1, String standby2, String standby3, Double workQty);
@Setter
OrderPakinService orderPakinService;
diff --git a/src/main/resources/mapper/OrderDetlMapper.xml b/src/main/resources/mapper/OrderDetlMapper.xml
index c46a62c..cc7ded4 100644
--- a/src/main/resources/mapper/OrderDetlMapper.xml
+++ b/src/main/resources/mapper/OrderDetlMapper.xml
@@ -55,12 +55,15 @@
<sql id="standbyAll">
and batch = #{batch}
- and line_number = #{lineNumber}
- and specs = #{specs}
+ and brand = #{brand}
and standby1 = #{standby1}
and standby2 = #{standby2}
and standby3 = #{standby3}
</sql>
+ <sql id="standbyAllMemo">
+ -- and line_number = #{lineNumber}
+ -- and specs = #{specs}
+ </sql>
<select id="selectItem" resultMap="BaseResultMap">
select * from man_order_detl
diff --git a/src/main/resources/mapper/OrderDetlPakinMapper.xml b/src/main/resources/mapper/OrderDetlPakinMapper.xml
index 256bbd8..d8cbc10 100644
--- a/src/main/resources/mapper/OrderDetlPakinMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakinMapper.xml
@@ -55,12 +55,15 @@
<sql id="standbyAll">
and batch = #{batch}
- and line_number = #{lineNumber}
- and specs = #{specs}
+ and brand = #{brand}
and standby1 = #{standby1}
and standby2 = #{standby2}
and standby3 = #{standby3}
</sql>
+ <sql id="standbyAllMemo">
+ -- and line_number = #{lineNumber}
+ -- and specs = #{specs}
+ </sql>
<select id="selectItem" resultMap="BaseResultMap">
select * from man_order_detl_pakin
diff --git a/src/main/resources/mapper/OrderDetlPakoutMapper.xml b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
index 1300fc1..18f781d 100644
--- a/src/main/resources/mapper/OrderDetlPakoutMapper.xml
+++ b/src/main/resources/mapper/OrderDetlPakoutMapper.xml
@@ -55,12 +55,15 @@
<sql id="standbyAll">
and batch = #{batch}
- and line_number = #{lineNumber}
- and specs = #{specs}
+ and brand = #{brand}
and standby1 = #{standby1}
and standby2 = #{standby2}
and standby3 = #{standby3}
</sql>
+ <sql id="standbyAllMemo">
+ -- and line_number = #{lineNumber}
+ -- and specs = #{specs}
+ </sql>
<select id="selectItem" resultMap="BaseResultMap">
select * from man_order_detl_pakout
--
Gitblit v1.9.1