From 676589bda29d81006eb8db7625502f4f22fdb904 Mon Sep 17 00:00:00 2001
From: "XI_TENG\\xixi_" <971623072>
Date: Thu, 25 Jul 2024 17:51:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E6=A0=BC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BusinessOrderServiceImpl.java     | 14 ++++++++++++++
 .../impl/WarehousingStorageServiceImpl.java        |  2 +-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java
index 87bd1378..035d0028 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java
@@ -332,6 +332,13 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
                 businessOrderQueryWrapper.eq("d.name",value);
             }
 
+            if(ObjectUtil.isNotEmpty(businessOrderPagination.getContractNo())){
+                businessOrderNum++;
+
+                String value = String.valueOf(businessOrderPagination.getContractNo());
+                businessOrderQueryWrapper.eq("d.contract_no",value);
+            }
+
 
             if(ObjectUtil.isNotEmpty(businessOrderPagination.getDeliveryType())){
                 businessOrderNum++;
@@ -703,6 +710,13 @@ public class BusinessOrderServiceImpl extends ServiceImpl<BusinessOrderMapper, B
 
             }
 
+
+            if(ObjectUtil.isNotEmpty(businessOrderPagination.getContractNo())){
+                businessOrderNum++;
+                String value = String.valueOf(businessOrderPagination.getContractNo());
+                businessOrderQueryWrapper.like("d.contract_no",value);
+            }
+
             if(ObjectUtil.isNotEmpty(businessOrderPagination.getBusinessNum())){
                 businessOrderNum++;
                 String value = String.valueOf(businessOrderPagination.getBusinessNum());
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
index 9ad28422..04535175 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java
@@ -824,7 +824,7 @@ public class WarehousingStorageServiceImpl extends ServiceImpl<WarehousingStorag
                     inventoryEntity.setPhoto(productWarehouseEntity.getPhoto());
                     inventoryEntity.setBrandId(productWarehouseEntity.getBrandId());
                     inventoryEntity.setProductTypeId(productWarehouseEntity.getProductTypeId());
-                    inventoryEntity.setSpec(productWarehouseEntity.getSpec());
+                    inventoryEntity.setSpec(entitys.getSpec());
                     inventoryEntity.setInventoryUnitId(productWarehouseEntity.getInventoryUnitId());
                     inventoryEntity.setWarehouseId(entity.getWarehouseId());
                     inventoryEntity.setStorageAreaId(entitys.getCargoId());