From 7c06b5d6b8bc9d52223370ac9e448574f2bf2766 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 9 Nov 2023 14:12:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=BA=BF=E7=89=A9=E6=96=99?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productionlineitem/vo/ProductionlineitemBaseVO.java      | 3 +++
 .../productionlineitem/vo/ProductionlineitemExportReqVO.java | 3 +++
 .../productionlineitem/vo/ProductionlineitemPageReqVO.java   | 3 +++
 .../dataobject/productionlineitem/ProductionlineitemDO.java  | 5 +++++
 .../mysql/productionlineitem/ProductionlineitemMapper.java   | 2 ++
 5 files changed, 16 insertions(+)

diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java
index e722cd06..50a4777d 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java
@@ -31,6 +31,9 @@ public class ProductionlineitemBaseVO {
     @NotNull(message = "物品代码不能为空")
     private String itemCode;
 
+    @Schema(description = "原料库位", requiredMode = Schema.RequiredMode.REQUIRED)
+    private String rawLocationCode;
+
     @Schema(description = "是否可用", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "是否可用不能为空")
     private String available;
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExportReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExportReqVO.java
index e426b65f..6931fc58 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExportReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemExportReqVO.java
@@ -21,6 +21,9 @@ public class ProductionlineitemExportReqVO {
     @Schema(description = "物品代码")
     private String itemCode;
 
+    @Schema(description = "原料库位")
+    private String rawLocationCode;
+
     @Schema(description = "是否可用")
     private String available;
 
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemPageReqVO.java
index cdbf67d1..eda3c3cf 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemPageReqVO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemPageReqVO.java
@@ -26,6 +26,9 @@ public class ProductionlineitemPageReqVO extends PageParam {
     @Schema(description = "物品代码")
     private String itemCode;
 
+    @Schema(description = "原料库位")
+    private String rawLocationCode;
+
     @Schema(description = "是否可用")
     private String available;
 
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionlineitem/ProductionlineitemDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionlineitem/ProductionlineitemDO.java
index 1cd3d21b..d4bf4d35 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionlineitem/ProductionlineitemDO.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionlineitem/ProductionlineitemDO.java
@@ -1,5 +1,6 @@
 package com.win.module.wms.dal.dataobject.productionlineitem;
 
+import com.sun.xml.bind.v2.TODO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -42,6 +43,10 @@ public class ProductionlineitemDO extends BaseDO {
      * 物品代码
      */
     private String itemCode;
+    /**
+     * 原料库位
+     */
+    private String rawLocationCode;
     /**
      * 是否可用
      *
diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java
index ffd0da42..a474a028 100644
--- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java
+++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/productionlineitem/ProductionlineitemMapper.java
@@ -25,6 +25,7 @@ public interface ProductionlineitemMapper extends BaseMapperX<Productionlineitem
                 .eqIfPresent(ProductionlineitemDO::getFgLocationCode, reqVO.getFgLocationCode())
                 .eqIfPresent(ProductionlineitemDO::getProductionLineCode, reqVO.getProductionLineCode())
                 .eqIfPresent(ProductionlineitemDO::getItemCode, reqVO.getItemCode())
+                .eqIfPresent(ProductionlineitemDO::getRawLocationCode, reqVO.getRawLocationCode())
                 .eqIfPresent(ProductionlineitemDO::getAvailable, reqVO.getAvailable())
                 .betweenIfPresent(ProductionlineitemDO::getActiveTime, reqVO.getActiveTime())
                 .betweenIfPresent(ProductionlineitemDO::getExpireTime, reqVO.getExpireTime())
@@ -41,6 +42,7 @@ public interface ProductionlineitemMapper extends BaseMapperX<Productionlineitem
                 .eqIfPresent(ProductionlineitemDO::getFgLocationCode, reqVO.getFgLocationCode())
                 .eqIfPresent(ProductionlineitemDO::getProductionLineCode, reqVO.getProductionLineCode())
                 .eqIfPresent(ProductionlineitemDO::getItemCode, reqVO.getItemCode())
+                .eqIfPresent(ProductionlineitemDO::getRawLocationCode, reqVO.getRawLocationCode())
                 .eqIfPresent(ProductionlineitemDO::getAvailable, reqVO.getAvailable())
                 .betweenIfPresent(ProductionlineitemDO::getActiveTime, reqVO.getActiveTime())
                 .betweenIfPresent(ProductionlineitemDO::getExpireTime, reqVO.getExpireTime())