From a3bea567c554c2c57809ceed2a040baf473aa95f Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期四, 27 三月 2025 13:04:38 +0800
Subject: [PATCH] 1
---
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderMapper.java | 2
zy-asrs-wms/src/main/webapp/views/locInPrintMat/locInPrintMat.html | 4
zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml | 3
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java | 14 +
zy-asrs-wms/src/main/webapp/views/pakStore/locCheckOut.html | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlService.java | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java | 10
zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html | 4
zy-asrs-wms/src/main/webapp/static/js/pakStore/locCheckOut.js | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/OrderMoveHistoryScheduler.java | 20 ++
zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery2.html | 4
zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml | 3
zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html | 3
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java | 1
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderLog.java | 38 +++
zy-asrs-common/src/main/resources/mapper/wms/OrderLogMapper.xml | 39 ++++
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlServiceImpl.java | 5
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java | 1
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java | 43 ++--
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 7
zy-asrs-wms/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js | 1
zy-asrs-wms/src/main/webapp/static/js/order/out.js | 2
zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html | 4
zy-asrs-wms/src/main/webapp/static/js/mat/mat.js | 2
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetlLog.java | 205 +++++++++++++++++-----
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java | 1
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java | 4
zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/OrderMoveHistoryHandler.java | 59 ++++++
28 files changed, 392 insertions(+), 91 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetlLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetlLog.java
index ca0af79..f9036f4 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetlLog.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderDetlLog.java
@@ -35,6 +35,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -44,10 +45,22 @@
private Long orderId;
/**
+ * 鍗曟嵁缂栧彿
+ */
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
+ private String orderNo;
+
+ /**
* 鏁伴噺
*/
@ApiModelProperty(value= "鏁伴噺")
private Double anfme;
+
+ @ApiModelProperty(value= "宸插畬鎴愭暟閲�")
+ private Double qty;
+
+ @ApiModelProperty(value= "浣滀笟鏁伴噺")
+ private Double workQty;
/**
* 鍟嗗搧缂栫爜
@@ -62,10 +75,10 @@
private String maktx;
/**
- * 鍚嶇О
+ * 鎵瑰彿
*/
- @ApiModelProperty(value= "鍚嶇О")
- private String name;
+ @ApiModelProperty(value= "鎵瑰彿")
+ private String batch;
/**
* 瑙勬牸
@@ -80,10 +93,16 @@
private String model;
/**
- * 鎵瑰彿
+ * 棰滆壊
*/
- @ApiModelProperty(value= "鎵瑰彿")
- private String batch;
+ @ApiModelProperty(value= "棰滆壊")
+ private String color;
+
+ /**
+ * 鍝佺墝
+ */
+ @ApiModelProperty(value= "鍝佺墝")
+ private String brand;
/**
* 鍗曚綅
@@ -92,40 +111,130 @@
private String unit;
/**
- * 鍟嗗搧鏉＄爜
- */
- @ApiModelProperty(value= "鍟嗗搧鏉＄爜")
- private String barcode;
-
- /**
- * 渚涘簲鍟�
- */
- @ApiModelProperty(value= "渚涘簲鍟�")
- private String supplier;
-
- /**
* 鍗曚环
*/
@ApiModelProperty(value= "鍗曚环")
- private Double unitPrice;
+ private Double price;
+
+ /**
+ * sku
+ */
+ @ApiModelProperty(value= "sku")
+ private String sku;
+
+ /**
+ * 鍗曚綅閲�
+ */
+ @ApiModelProperty(value= "鍗曚綅閲�")
+ private Double units;
+
+ /**
+ * 鏉＄爜
+ */
+ @ApiModelProperty(value= "鏉＄爜")
+ private String barcode;
+
+ /**
+ * 浜у湴
+ */
+ @ApiModelProperty(value= "浜у湴")
+ private String origin;
+
+ /**
+ * 鍘傚
+ */
+ @ApiModelProperty(value= "鍘傚")
+ private String manu;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ private String manuDate;
/**
* 鍝侀」鏁�
*/
@ApiModelProperty(value= "鍝侀」鏁�")
- private Integer itemNum;
+ private String itemNum;
/**
- * 鏁伴噺
+ * 瀹夊叏搴撳瓨閲�
*/
- @ApiModelProperty(value= "鏁伴噺")
- private Double count;
+ @ApiModelProperty(value= "瀹夊叏搴撳瓨閲�")
+ private Double safeQty;
/**
* 閲嶉噺
*/
@ApiModelProperty(value= "閲嶉噺")
private Double weight;
+
+ /**
+ * 闀垮害
+ */
+ @ApiModelProperty(value= "闀垮害")
+ private Double length;
+
+ /**
+ * 浣撶Н
+ */
+ @ApiModelProperty(value= "浣撶Н")
+ private Double volume;
+
+ /**
+ * 浠撳簱鍙�
+ */
+ @ApiModelProperty(value= "浠撳簱鍙�")
+ private String threeCode;
+
+ /**
+ * 鏉ユ簮鍗曞彿
+ */
+ @ApiModelProperty(value= "鏉ユ簮鍗曞彿")
+ private String supp;
+
+ /**
+ * 鏉ユ簮搴忓彿
+ */
+ @ApiModelProperty(value= "鏉ユ簮搴忓彿")
+ private String suppCode;
+
+ /**
+ * 鏄惁鎵规 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鏄惁鎵规 1: 鏄� 0: 鍚� ")
+ private Integer beBatch;
+
+ /**
+ * 淇濊川鏈�
+ */
+ @ApiModelProperty(value= "淇濊川鏈�")
+ private String deadTime;
+
+ /**
+ * 棰勮澶╂暟
+ */
+ @ApiModelProperty(value= "棰勮澶╂暟")
+ private Integer deadWarn;
+
+ /**
+ * 鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗
+ */
+ @ApiModelProperty(value= "鍒惰喘 1: 鍒堕�� 2: 閲囪喘 3: 澶栧崗 ")
+ private Integer source;
+
+ /**
+ * 瑕佹眰妫�楠� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "瑕佹眰妫�楠� 1: 鏄� 0: 鍚� ")
+ private Integer inspect;
+
+ /**
+ * 鍗遍櫓鍝� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "鍗遍櫓鍝� 1: 鏄� 0: 鍚� ")
+ private Integer danger;
/**
* 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
@@ -173,31 +282,31 @@
public OrderDetlLog() {}
- public OrderDetlLog(Long id,Long orderId,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,String supplier,Double unitPrice,Integer itemNum,Double count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Long hostId) {
- this.id = id;
- this.orderId = orderId;
- this.anfme = anfme;
- this.matnr = matnr;
- this.maktx = maktx;
- this.name = name;
- this.specs = specs;
- this.model = model;
- this.batch = batch;
- this.unit = unit;
- this.barcode = barcode;
- this.supplier = supplier;
- this.unitPrice = unitPrice;
- this.itemNum = itemNum;
- this.count = count;
- this.weight = weight;
- this.status = status;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- this.hostId = hostId;
- }
+// public OrderDetlLog(Long id,Long orderId,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,String supplier,Double unitPrice,Integer itemNum,Double count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,Long hostId) {
+// this.id = id;
+// this.orderId = orderId;
+// this.anfme = anfme;
+// this.matnr = matnr;
+// this.maktx = maktx;
+// this.name = name;
+// this.specs = specs;
+// this.model = model;
+// this.batch = batch;
+// this.unit = unit;
+// this.barcode = barcode;
+// this.supplier = supplier;
+// this.unitPrice = unitPrice;
+// this.itemNum = itemNum;
+// this.count = count;
+// this.weight = weight;
+// this.status = status;
+// this.createBy = createBy;
+// this.createTime = createTime;
+// this.updateBy = updateBy;
+// this.updateTime = updateTime;
+// this.memo = memo;
+// this.hostId = hostId;
+// }
// OrderDetlLog orderDetlLog = new OrderDetlLog(
// null, // ID[闈炵┖]
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderLog.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderLog.java
index 5bacd3e..cc76284 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderLog.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/OrderLog.java
@@ -3,6 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.annotation.*;
import com.zy.asrs.common.wms.service.CstmrService;
import com.zy.asrs.common.wms.service.DocTypeService;
import com.zy.asrs.common.wms.service.ItemService;
@@ -14,10 +15,6 @@
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -41,6 +38,7 @@
* ID
*/
@ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -52,40 +50,47 @@
/**
* 璁㈠崟缂栧彿
*/
+ @TableField("order_no")
@ApiModelProperty(value= "璁㈠崟缂栧彿")
private String orderNo;
/**
* 鍗曟嵁鏃ユ湡
*/
+ @TableField("order_time")
@ApiModelProperty(value= "鍗曟嵁鏃ユ湡")
private String orderTime;
/**
* 鍗曟嵁绫诲瀷
*/
+ @TableField("doc_type")
@ApiModelProperty(value= "鍗曟嵁绫诲瀷")
private Long docType;
/**
* 椤圭洰缂栧彿
*/
+ @TableField("item_id")
@ApiModelProperty(value= "椤圭洰缂栧彿")
private Long itemId;
@ApiModelProperty(value= "")
+ @TableField("item_name")
private String itemName;
/**
* 璋冩嫧椤圭洰缂栧彿
*/
@ApiModelProperty(value= "璋冩嫧椤圭洰缂栧彿")
+ @TableField("allot_item_id")
private Long allotItemId;
/**
* 鍒濆绁ㄦ嵁鍙�
*/
@ApiModelProperty(value= "鍒濆绁ㄦ嵁鍙�")
+ @TableField("def_number")
private String defNumber;
/**
@@ -104,6 +109,7 @@
* 瀹㈡埛
*/
@ApiModelProperty(value= "瀹㈡埛")
+ @TableField("cstmr_name")
private String cstmrName;
/**
@@ -116,12 +122,14 @@
* 鎿嶄綔浜哄憳
*/
@ApiModelProperty(value= "鎿嶄綔浜哄憳")
+ @TableField("oper_memb")
private String operMemb;
/**
* 鍚堣閲戦
*/
@ApiModelProperty(value= "鍚堣閲戦")
+ @TableField("total_fee")
private Double totalFee;
/**
@@ -134,24 +142,28 @@
* 浼樻儬閲戦
*/
@ApiModelProperty(value= "浼樻儬閲戦")
+ @TableField("discount_fee")
private Double discountFee;
/**
* 閿�鍞垨閲囪喘璐圭敤鍚堣
*/
@ApiModelProperty(value= "閿�鍞垨閲囪喘璐圭敤鍚堣")
+ @TableField("other_fee")
private Double otherFee;
/**
* 瀹炰粯閲戦
*/
@ApiModelProperty(value= "瀹炰粯閲戦")
+ @TableField("act_fee")
private Double actFee;
/**
- * 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
+ * 浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处
*/
@ApiModelProperty(value= "浠樻绫诲瀷 1: 鐜伴噾 2: 璁拌处 ")
+ @TableField("pay_type")
private Integer payType;
/**
@@ -164,18 +176,21 @@
* 缁撶畻澶╂暟
*/
@ApiModelProperty(value= "缁撶畻澶╂暟")
+ @TableField("account_day")
private Integer accountDay;
/**
- * 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
+ * 閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻
*/
@ApiModelProperty(value= "閭垂鏀粯绫诲瀷 1: 鍦ㄧ嚎鏀粯 2: 璐у埌浠樻 ")
+ @TableField("post_fee_type")
private Integer postFeeType;
/**
* 閭垂
*/
@ApiModelProperty(value= "閭垂")
+ @TableField("post_fee")
private Double postFee;
/**
@@ -183,6 +198,7 @@
*/
@ApiModelProperty(value= "浠樻鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("pay_time")
private Date payTime;
/**
@@ -190,18 +206,21 @@
*/
@ApiModelProperty(value= "鍙戣揣鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("send_time")
private Date sendTime;
/**
* 鐗╂祦鍚嶇О
*/
@ApiModelProperty(value= "鐗╂祦鍚嶇О")
+ @TableField("ship_name")
private String shipName;
/**
* 鐗╂祦鍗曞彿
*/
@ApiModelProperty(value= "鐗╂祦鍗曞彿")
+ @TableField("ship_code")
private String shipCode;
/**
@@ -211,7 +230,7 @@
private Long settle;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
+ * 鐘舵�� 1: 姝ｅ父 0: 绂佺敤
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 绂佺敤 ")
private Integer status;
@@ -220,6 +239,7 @@
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
+ @TableField("create_by")
private Long createBy;
/**
@@ -227,12 +247,14 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("create_time")
private Date createTime;
/**
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
+ @TableField("update_by")
private Long updateBy;
/**
@@ -240,6 +262,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @TableField("update_time")
private Date updateTime;
/**
@@ -252,6 +275,7 @@
* 鎺堟潈鍟嗘埛
*/
@ApiModelProperty(value= "鎺堟潈鍟嗘埛")
+ @TableField("host_id")
private Long hostId;
public OrderLog() {}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java
index fc1e0f7..b726420 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderDetlMapper.java
@@ -35,4 +35,5 @@
int increaseWorkQty(@Param("orderId") Long orderId, @Param("matnr") String matnr, @Param("batch") String batch, @Param("workQty") Double workQty, @Param("hostId") Long hostId);
+ int addToLogTable(OrderDetl orderDetl);
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderMapper.java
index ebc9077..700db19 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderMapper.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/OrderMapper.java
@@ -17,5 +17,5 @@
List<Order> selectComplete();
int updateSettle(@Param("orderId") Long orderId, @Param("settle") Long settle, @Param("userId") Long userId, @Param("hostId") Long hostId);
-
+ int addToLogTable(Order order);
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlService.java
index dae78ce..8e3bbe9 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderDetlService.java
@@ -24,4 +24,5 @@
boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty, Long hostId);
+ boolean addToLogTable(OrderDetl orderDetl);
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java
index 3bd6353..adb5820 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/OrderService.java
@@ -29,5 +29,6 @@
List<String> selectAllOutOrderNo(String orderNo,Long hostId);
List<Order> selectComplete();
+ boolean addToLogTable(Order order);
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlServiceImpl.java
index 5f84f49..01a4391 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderDetlServiceImpl.java
@@ -58,4 +58,9 @@
public boolean increaseWorkQty(Long orderId, String matnr, String batch, Double workQty, Long hostId) {
return this.baseMapper.increaseWorkQty(orderId, matnr, batch, workQty, hostId) > 0;
}
+
+ @Override
+ public boolean addToLogTable(OrderDetl orderDetl) {
+ return this.baseMapper.addToLogTable(orderDetl) > 0;
+ }
}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
index 3a9d595..98b6a0c 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/OrderServiceImpl.java
@@ -218,4 +218,8 @@
return orderNameListDtos;
}
+ @Override
+ public boolean addToLogTable(Order order) {
+ return this.baseMapper.addToLogTable(order) > 0;
+ }
}
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml
index 5a47b0f..be427a1 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/OrderDetlMapper.xml
@@ -160,4 +160,7 @@
</choose>
</update>
+ <insert id="addToLogTable">
+ INSERT INTO man_order_detl_log SELECT * FROM man_order_detl WHERE id = #{id}
+ </insert>
</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/OrderLogMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/OrderLogMapper.xml
index 4fd146a..ee302f2 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/OrderLogMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/OrderLogMapper.xml
@@ -1,5 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.zy.asrs.common.wms.mapper.OrderLogMapper">
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.common.wms.entity.Order">
+ <id column="id" property="id" />
+ <result column="uuid" property="uuid" />
+ <result column="order_no" property="orderNo" />
+ <result column="order_time" property="orderTime" />
+ <result column="doc_type" property="docType" />
+ <result column="item_id" property="itemId" />
+ <result column="item_name" property="itemName" />
+ <result column="allot_item_id" property="allotItemId" />
+ <result column="def_number" property="defNumber" />
+ <result column="number" property="number" />
+ <result column="cstmr" property="cstmr" />
+ <result column="cstmr_name" property="cstmrName" />
+ <result column="tel" property="tel" />
+ <result column="oper_memb" property="operMemb" />
+ <result column="total_fee" property="totalFee" />
+ <result column="discount" property="discount" />
+ <result column="discount_fee" property="discountFee" />
+ <result column="other_fee" property="otherFee" />
+ <result column="act_fee" property="actFee" />
+ <result column="pay_type" property="payType" />
+ <result column="salesman" property="salesman" />
+ <result column="account_day" property="accountDay" />
+ <result column="post_fee_type" property="postFeeType" />
+ <result column="post_fee" property="postFee" />
+ <result column="pay_time" property="payTime" />
+ <result column="send_time" property="sendTime" />
+ <result column="ship_name" property="shipName" />
+ <result column="ship_code" property="shipCode" />
+ <result column="settle" property="settle" />
+ <result column="status" property="status" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="memo" property="memo" />
+ <result column="host_id" property="hostId" />
+ </resultMap>
</mapper>
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml
index bad136d..d607569 100644
--- a/zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml
+++ b/zy-asrs-common/src/main/resources/mapper/wms/OrderMapper.xml
@@ -75,6 +75,9 @@
and status = 1
order by create_time asc
</select>
+ <insert id="addToLogTable">
+ INSERT INTO man_order_log SELECT * FROM man_order WHERE id = #{id}
+ </insert>
</mapper>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
index 0677f79..34d0e0c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
@@ -109,8 +109,11 @@
List<LocDetl> locDetls=new ArrayList<>();
for (LocDetl l:list
) {
- String new_String = l.getMatnr().replace("\"","");
- l.setMatnr(new_String);
+ if(Cools.isEmpty(l.getMaktx())){
+ continue;
+ }
+ String new_String = l.getMaktx().replace("\"","");
+ l.setMaktx(new_String);
locDetls.add(l);
}
return R.ok(exportSupport(locDetls, fields));
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
index ea3fdf0..810e5d9 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MatController.java
@@ -194,6 +194,7 @@
}
OrderDetl orderDetl = new OrderDetl();
orderDetl.sync(mat);
+ orderDetl.setBatch("");
orderDetl.setAnfme(0.0D);
return R.ok().add(orderDetl);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
index 32e00bd..d4d4055 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
@@ -496,7 +496,18 @@
ArrayList<Long> orderIds = new ArrayList<>();
for (Order order : orders) {
- orderIds.add(order.getId());
+ Date currentDate = new Date();
+
+ Calendar calendar = Calendar.getInstance();
+ calendar.setTime(currentDate);
+ calendar.add(Calendar.MONTH, -1);
+
+ Date previousMonthDate = calendar.getTime();
+ int result=previousMonthDate.compareTo(order.getCreateTime());
+ if(result<0){
+ orderIds.add(order.getId());
+ }
+
}
//鎼滅储鏄庣粏
@@ -505,6 +516,7 @@
wrapper1.eq(OrderDetl::getHostId, getHostId());
wrapper1.in(OrderDetl::getOrderId, orderIds);
wrapper1.orderByDesc(OrderDetl::getCreateTime);
+// wrapper1.last("LIMIT 1000");
if (!Cools.isEmpty(matnr)) {
wrapper1.like(OrderDetl::getMatnr, matnr);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
index 9c4fa47..5cdedf2 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/OutController.java
@@ -89,11 +89,17 @@
if (issued >0){
List<LocDetl> locDetls = locDetlService.queryStock(orderDetl.getMatnr(), orderDetl.getBatch(), hostId);
for (LocDetl locDetl : locDetls) {
- for (HashMap.Entry<String,Integer> entry:hm.entrySet()){
+ //杩囨护鎺夊湪宸茶鏍囪鐨勫簱浣嶅彿
+ boolean boo=false;
+ for (HashMap.Entry<String,Integer> entry:hm.entrySet()) {
if(locDetl.getLocNo().equals(entry.getKey())){
- continue;
+ boo=true;
+ break;
}
}
+ if (boo){
+ continue;
+ }
List<LocDetl> locMats = locDetlService.list(new LambdaQueryWrapper<LocDetl>()
.eq(LocDetl::getLocNo, locDetl.getLocNo())
.eq(LocDetl::getHostId, hostId));
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
index 6d57317..d0bb41e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/TagController.java
@@ -223,23 +223,28 @@
if (Cools.isEmpty(mat)){
return R.error("鍝佸彿:"+locInPrintMat.getMatnr()+"涓嶅瓨鍦紝璇峰厛鏂板鍟嗗搧妗ｆ锛侊紒锛�").add("鍝佸彿:"+locInPrintMat.getMatnr()+"涓嶅瓨鍦紝璇峰厛鏂板鍟嗗搧妗ｆ锛侊紒锛�");
}
- // 鎵撳嵃鏁版嵁娉ㄥ叆
- MatPrint print = new MatPrint();
- print.setMatnr(mat.getMatnr());
- print.setBarcode(mat.getBarcode());
- print.setMaktx(mat.getMaktx());
- print.setSpecs(mat.getSpecs());
- print.setUnit(mat.getUnit());
- print.setMemo(mat.getMemo());
+ int count=1;
+ if(!Cools.isEmpty(locInPrintMat.getAnfme())){
+ count=locInPrintMat.getAnfme().intValue();
+ }
+ for(int i=1;i<=count;i++){
+ // 鎵撳嵃鏁版嵁娉ㄥ叆
+ MatPrint print = new MatPrint();
+ print.setMatnr(mat.getMatnr());
+ print.setBarcode(mat.getBarcode());
+ print.setMaktx(mat.getMaktx());
+ print.setSpecs(mat.getSpecs());
+ print.setUnit(mat.getUnit());
+ print.setMemo(mat.getMemo());
- print.setMaterial(mat.getMaterial());
- print.setDecrees(locInPrintMat.getDecrees());
- print.setImgNum(mat.getImgNum());
- print.setWeight(String.valueOf(mat.getWeight()));
- print.setModel(mat.getModel());
- print.setLength(String.valueOf(mat.getLength()));
- print.setWidth(mat.getWidth());
- print.setHeight(mat.getHeight());
+ print.setMaterial(mat.getMaterial());
+ print.setDecrees(locInPrintMat.getDecrees());
+ print.setImgNum(mat.getImgNum());
+ print.setWeight(String.valueOf(mat.getWeight()));
+ print.setModel(mat.getModel());
+ print.setLength(String.valueOf(mat.getLength()));
+ print.setWidth(mat.getWidth());
+ print.setHeight(mat.getHeight());
// // 鎵撳嵃鏁版嵁娉ㄥ叆
// MatPrint print = new MatPrint();
// print.setMatnr(locInPrintMat.getMatnr());
@@ -249,8 +254,10 @@
// print.setLocNo(locInPrintMat.getLocNo());
// print.setOwnerId(locInPrintMat.getOwnerId());
// print.setOwner(locInPrintMat.getOwner$());
- print.setId(locInPrintMat.getId());
- res.add(print);
+ print.setId(locInPrintMat.getId());
+ res.add(print);
+ }
+
locInPrintMat.setUpdateTime(new Date());
locInPrintMat.setUpdateBy(getUserId());
locInPrintMat.setStatus(2);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/OrderMoveHistoryScheduler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/OrderMoveHistoryScheduler.java
new file mode 100644
index 0000000..e78e4c6
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/OrderMoveHistoryScheduler.java
@@ -0,0 +1,20 @@
+package com.zy.asrs.wms.task;
+
+import com.zy.asrs.wms.task.handler.OrderMoveHistoryHandler;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+@Component
+public class OrderMoveHistoryScheduler {
+ @Autowired
+ private OrderMoveHistoryHandler orderMoveHistoryHandler;
+
+ /**
+ * 灏嗗凡瀹屾垚order鍜宱rderDetl绉诲姩鍒發og琛�
+ */
+// @Scheduled(cron = "0 * * * * ?")
+ public void execute(){
+ orderMoveHistoryHandler.start();
+ }
+}
\ No newline at end of file
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/OrderMoveHistoryHandler.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/OrderMoveHistoryHandler.java
new file mode 100644
index 0000000..6554e91
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/OrderMoveHistoryHandler.java
@@ -0,0 +1,59 @@
+package com.zy.asrs.wms.task.handler;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.sun.org.apache.xpath.internal.operations.Or;
+import com.zy.asrs.common.wms.entity.Order;
+import com.zy.asrs.common.wms.entity.OrderDetl;
+import com.zy.asrs.common.wms.service.OrderDetlService;
+import com.zy.asrs.common.wms.service.OrderService;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.wms.task.AbstractHandler;
+import com.zy.asrs.wms.task.core.ReturnT;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Date;
+import java.util.List;
+
+@Service
+@Slf4j
+public class OrderMoveHistoryHandler extends AbstractHandler<String> {
+ @Autowired
+ private OrderService orderService;
+ @Autowired
+ private OrderDetlService orderDetlService;
+
+ public ReturnT<String> start(){
+ List<Order> settleEqual6 = orderService.list(new LambdaQueryWrapper<Order>()
+ .in(Order::getSettle, 6,7));
+ for (Order order : settleEqual6) {
+ List<OrderDetl> orderDetls = orderDetlService.list(new LambdaQueryWrapper<OrderDetl>()
+ .eq(OrderDetl::getOrderNo, order.getOrderNo()));
+ moveBoth(order,orderDetls);
+ log.info("宸插畬鎴愬崟鎹Щ鍔ㄨ嚦鍘嗗彶琛ㄦ垚鍔� =====>" +order);
+ }
+ return SUCCESS;
+ }
+
+ private void moveBoth(Order order, List<OrderDetl> orderDetls){
+ Date now = new Date();
+ if (!Cools.isEmpty(orderDetls)) {
+ for (OrderDetl orderDetl : orderDetls) {
+ orderDetl.setUpdateBy(0L);
+ orderDetl.setUpdateTime(now);
+ orderDetlService.addToLogTable(orderDetl);
+ orderDetlService.remove(new LambdaQueryWrapper<OrderDetl>()
+ .eq(OrderDetl::getId,orderDetl.getId()));
+ }
+ }
+ if (!Cools.isEmpty(order)){
+ order.setUpdateBy(0L);
+ order.setUpdateTime(now);
+ orderService.addToLogTable(order);
+ orderService.remove(new LambdaQueryWrapper<Order>()
+ .eq(Order::getId,order.getId()));
+ }
+ }
+
+}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js b/zy-asrs-wms/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js
index e017858..aff1d88 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/locInPrintMat/locInPrintMat.js
@@ -35,6 +35,7 @@
// ,{field: 'anfme', align: 'center',title: '閲嶉噺(kg)', width:100,hide: false}
// ,{field: 'locNo', align: 'center',title: '搴撲綅鍙�', width:120,hide: false}
,{field: 'maktx', align: 'center',title: '鍝佸悕',hide: false}
+ ,{field: 'anfme', align: 'center',title: '鏁搁噺',hide: false}
// ,{field: 'owner$', align: 'center',title: '璐т富',hide: false}
// ,{field: 'createTime$', align: 'center',title: '鍏ュ簱鏃堕棿', width:120,hide: false}
// ,{field: 'createBy$', align: 'center',title: '鍏ュ簱浜哄憳', width:100,hide: false}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js b/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js
index e38beeb..409af88 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/mat/mat.js
@@ -52,7 +52,7 @@
url: baseUrl+'/mat/page/auth',
page: true,
limit: 16,
- limits: [16, 30, 50, 100, 200, 500,1000,2000],
+ limits: [16, 30, 50, 100, 200, 500,1000,2000,10000,100000],
toolbar: '#toolbar',
cellMinWidth: 50,
height: 'full-105',
diff --git a/zy-asrs-wms/src/main/webapp/static/js/order/out.js b/zy-asrs-wms/src/main/webapp/static/js/order/out.js
index 3c8d992..0e94556 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/order/out.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/order/out.js
@@ -35,7 +35,7 @@
,{field: 'matnr', align: 'center',title: '鍝佸彿', width: 160}
,{field: 'maktx', align: 'center',title: '鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
- ,{field: 'origin', align: 'center',title: '浠撳簱鍙�'}
+ // ,{field: 'origin', align: 'center',title: '浠撳簱鍙�'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/pakStore/locCheckOut.js b/zy-asrs-wms/src/main/webapp/static/js/pakStore/locCheckOut.js
index 073d240..7e16681 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/pakStore/locCheckOut.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -25,6 +25,7 @@
headers: {token: localStorage.getItem('token')},
data: [],
even: true,
+ limit: 1000,
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [getCol()],
diff --git a/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html b/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html
index 0ecc6dd..d2696d9 100644
--- a/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html
+++ b/zy-asrs-wms/src/main/webapp/views/locDetl/locDetl.html
@@ -71,7 +71,8 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="margin-top: 10px">瀵煎嚭</button>
+ <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="
+ margin-top: 10px">瀵煎嚭</button>
</div>
</script>
diff --git a/zy-asrs-wms/src/main/webapp/views/locInPrintMat/locInPrintMat.html b/zy-asrs-wms/src/main/webapp/views/locInPrintMat/locInPrintMat.html
index 1ef1231..4976727 100644
--- a/zy-asrs-wms/src/main/webapp/views/locInPrintMat/locInPrintMat.html
+++ b/zy-asrs-wms/src/main/webapp/views/locInPrintMat/locInPrintMat.html
@@ -281,9 +281,9 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">澶囨敞: </label>
+ <label class="layui-form-label">鏁搁噺: </label>
<div class="layui-input-block">
- <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ <input class="layui-input" name="anfme" placeholder="璇疯緭鍏ユ暩閲�">
</div>
</div>
</div>
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/locCheckOut.html b/zy-asrs-wms/src/main/webapp/views/pakStore/locCheckOut.html
index f275897..a2c52d9 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/locCheckOut.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/locCheckOut.html
@@ -126,7 +126,7 @@
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
-<script type="text/javascript" src="../../static/js/pakStore/locCheckOut.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/pakStore/locCheckOut.js?v=2" charset="utf-8"></script>
<div id="resetLocDiv" style="margin: 20px 0 10px 30px; display: none">
<div class="layui-form layui-form-pane">
<!-- 鎺� -->
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 5fd26c3..57b1afa 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -137,8 +137,8 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/stock/out/list/auth',
page: true,
- limit: 20,
- limits: [20, 50, 100, 200, 500],
+ limit: 100,
+ limits: [100, 200, 500],
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html
index db1e89c..7b25df5 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -154,8 +154,8 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/stock/out/list/auth',
page: true,
- limits: [16, 30, 50, 100, 200, 500],
- limit: 16,
+ limits: [100, 200, 500],
+ limit: 100,
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery2.html b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery2.html
index 237f91b..1e8524f 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery2.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/locDetlQuery2.html
@@ -127,8 +127,8 @@
headers: {token: localStorage.getItem('token')},
url: baseUrl+'/stock/out/list/auth/v2',
page: true,
- limits: [16, 30, 50, 100, 200, 500],
- limit: 16,
+ limits: [100, 200, 500],
+ limit: 100,
even: true,
toolbar: '#toolbar',
cellMinWidth: 50,
--
Gitblit v1.9.1