From 4e32eae9008b56a346f52710d86241890a0ae1a7 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 27 十一月 2025 19:59:00 +0800
Subject: [PATCH] #库存调整
---
src/main/java/com/zy/asrs/entity/CheckOrderDetl.java | 28 +++++++++-------------------
1 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/CheckOrderDetl.java b/src/main/java/com/zy/asrs/entity/CheckOrderDetl.java
index d86d360..0b3ade0 100644
--- a/src/main/java/com/zy/asrs/entity/CheckOrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/CheckOrderDetl.java
@@ -69,7 +69,8 @@
private BigDecimal anfme;
@ApiModelProperty(value= "")
- private BigDecimal qty;
+ @TableField("diff_qty")
+ private BigDecimal diffQty;
/**
* 鍟嗗搧缂栫爜
@@ -257,7 +258,7 @@
/**
* 鐘舵�� 1: 鏈敓鎴� 0: 绂佺敤 2锛氬緟鐩� 3锛氬凡鐩�
*/
- @ApiModelProperty(value= "鐘舵�� 1: 鏈敓鎴� 0: 绂佺敤 2锛氬緟鐩� 3锛氬凡鐩�")
+ @ApiModelProperty(value= "鐘舵�� 1: 鏈敓鎴� 0: 绂佺敤 2锛氬緟鐩� 3锛氬凡鐩� 4:寰呰皟鏁� 5:宸茶皟鏁�")
private Integer status;
/**
@@ -389,11 +390,11 @@
public CheckOrderDetl() {}
- public CheckOrderDetl(Long orderId,String orderNo,BigDecimal anfme,BigDecimal qty,String matnr,String maktx,String batch,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double manLength,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,BigDecimal workQty,String qrCode,Date startDate,Date endDate,Integer pakinPakoutStatus,Long lineNumber,String locNo,Long version) {
+ public CheckOrderDetl(Long orderId,String orderNo,BigDecimal anfme,BigDecimal diffQty,String matnr,String maktx,String batch,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double manLength,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,BigDecimal workQty,String qrCode,Date startDate,Date endDate,Integer pakinPakoutStatus,Long lineNumber,String locNo,Long version) {
this.orderId = orderId;
this.orderNo = orderNo;
this.anfme = anfme;
- this.qty = qty;
+ this.diffQty = diffQty;
this.matnr = matnr;
this.maktx = maktx;
this.batch = batch;
@@ -489,21 +490,6 @@
// null // [闈炵┖]
// );
- public Double getDiffQty() {
- if (null == this.status || this.status == 1 || this.status == 0 ) {
- return 0D;
- }
- if (null != this.anfme && this.workQty != null) {
-
- BigDecimal subtract = new BigDecimal(this.workQty.toString()).subtract(new BigDecimal(this.anfme.toString()));
-
- return subtract.doubleValue();
- }
-// if (null != this.anfme && this.qty != null) {
-// return this.anfme - this.qty;
-// }
- return null;
- }
public String getOrderId$(){
OrderService service = SpringUtils.getBean(OrderService.class);
@@ -575,6 +561,10 @@
return "寰呯洏";
case 3:
return "宸茬洏";
+ case 4:
+ return "寰呰皟鏁�";
+ case 5:
+ return "宸茶皟鏁�";
default:
return String.valueOf(this.status);
}
--
Gitblit v1.9.1