From 0dba1cdf4fd73d7750463a38b170090c0f2fcdf9 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Tue, 18 Jul 2023 17:01:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/constant/ModuleNameConstant.java   |  2 +-
 .../entity/DistributionStockupEntity.java     |  6 ++++++
 .../WarehouseWarehousingDetailEntity.java     | 11 +++++++++++
 .../mapper/DistributionStockupMapper.xml      | 19 +++++++++++++++----
 .../impl/DistributionStockupServiceImpl.java  |  4 ++++
 .../WarehouseWarehousingEntryServiceImpl.java |  2 +-
 6 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
index d4d3b3676..7afdfe3b7 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java
@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="-zhy";
+	public static final String DEVAUTH ="-cyz";
 
 	/**
 	 * 工厂对接服务名称
diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java
index 4162faada..67c9f2498 100644
--- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java
+++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockupEntity.java
@@ -135,6 +135,12 @@ public class DistributionStockupEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "装卸班组")
 	private String loaderName;
+
+	/**
+	 * 备货人id
+	 */
+	@ApiModelProperty(value = "备货人id")
+	private Long stockupUserId;
 	/**
 	 * 确认完成备货时间
 	 */
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWarehousingDetailEntity.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWarehousingDetailEntity.java
index 10e6ab31b..a50308273 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWarehousingDetailEntity.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseWarehousingDetailEntity.java
@@ -117,4 +117,15 @@ public class WarehouseWarehousingDetailEntity extends TenantEntity {
 	@ApiModelProperty(value = "入库单ID")
 	private Long warehousingEntryId;
 
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "品牌名称")
+	private String brandName;
+	/**
+	 * 品牌iD
+	 */
+	@ApiModelProperty(value = "品牌ID")
+	private Long brandId;
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
index 03e5eb234..6ca693e18 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml
@@ -25,8 +25,10 @@
         <result column="reserve4" property="reserve4"/>
         <result column="reserve5" property="reserve5"/>
         <result column="goods_area_id" property="goodsAreaId"/>
-        <result column="forklift" property="forkliftId"/>
-        <result column="loader" property="loaderId"/>
+        <result column="forklift_id" property="forkliftId"/>
+        <result column="loader_id" property="loaderId"/>
+        <result column="forklift_name" property="forkliftName"/>
+        <result column="loader_name" property="loaderName"/>
         <result column="fix_time" property="fixTime"/>
         <result column="assign_time" property="assignTime"/>
     </resultMap>
@@ -37,12 +39,21 @@
     </select>
     <select id="pageList" resultType="com.logpm.distribution.vo.DistributionStockupVO">
         select lds.id,lds.stockup_date , lds.stockup_user , lds.stockup_status , lds.stockup_area , lds.assign_status , lds.stockip_allocation , lds.goods_area_id , lds.forklift_name ,
-               lds.loader_name , lds.forklift_id ,lds.loader_id ,lds.fix_time ,lds.assign_time,lwga.headline,btg.group_name
+               lds.loader_name , lds.forklift_id ,lds.loader_id ,lds.fix_time ,lds.assign_time,lwga.headline,btg.group_name,lds.type_service
         from logpm_distribution_stockup lds
                  LEFT JOIN logpm_warehouse_goods_area lwga ON lds.stockup_area = lwga.id
                  LEFT JOIN logpm_basicdata_team_group btg ON lds.loader_id = btg.id
         <where>
-            lds.tenant_id = #{param.tenantId}
+           <!-- lds.tenant_id = #{param.tenantId} -->
+            <if test="param.typeService != null and param.typeService != '' "> and lds.type_service = #{param.typeService}</if>
+            <if test="param.stockupDate != null  "> and  TO_DAYS(lds.stockup_date)=TO_DAYS( #{param.stockupDate})</if>
+            <if test="param.stockupUser != null and param.stockupUser != '' "> and lds.stockup_user = #{param.stockupUser}</if>
+            <if test="param.stockupStatus != null and param.stockupStatus != '' "> and lds.stockup_status = #{param.stockupStatus}</if>
+            <if test="param.stockupArea != null and param.stockupArea != '' "> and lds.stockup_area = #{param.stockupArea}</if>
+            <if test="param.assignStatus != null and param.assignStatus != '' "> and lds.assign_status = #{param.assignStatus}</if>
+            <if test="param.forkliftName != null and param.forkliftName != '' "> and lds.forklift_name = #{param.forkliftName}</if>
+            <if test="param.loaderName != null and param.loaderName != '' "> and lds.loader_name = #{param.loaderName}</if>
+            <if test="param.typeService != null and param.typeService != '' "> and lds.type_service = #{param.typeService}</if>
         </where>
     </select>
 
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
index 1d446fe04..c494db131 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java
@@ -23,6 +23,7 @@ import com.logpm.distribution.vo.DistributionStockupVO;
 import com.logpm.distribution.excel.DistributionStockupExcel;
 import com.logpm.distribution.mapper.DistributionStockupMapper;
 import com.logpm.distribution.service.IDistributionStockupService;
+import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -65,12 +66,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 		if(StringUtils.isNotBlank(distributionStockup.getIds())){
 			String[] split = distributionStockup.getIds().split(",");
 			for (String s : split) {
+				BladeUser user = AuthUtil.getUser();
 				DistributionStockupEntity distributionStockupEntity =new DistributionStockupEntity();
 				BeanUtils.copyProperties(distributionStockup,distributionStockupEntity);
 				distributionStockupEntity.setId(Long.parseLong(s));
 				distributionStockupEntity.setAssignStatus("2");
 				distributionStockupEntity.setStockupStatus("2");
 				distributionStockupEntity.setAssignTime(new Date());
+				distributionStockupEntity.setStockupUser(user.getUserName());
+				distributionStockupEntity.setStockupUserId(user.getUserId());
 				baseMapper.updateById(distributionStockupEntity);
 			}
 			return true;
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
index 126f1f0de..55494db9b 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWarehousingEntryServiceImpl.java
@@ -221,7 +221,7 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 //			distributionStockListEntity.setUnit("单位");//单位
 			distributionStockListEntity.setWarehouseName(warehousingEntryDTO.getWarehouse());//仓库名称
 //			distributionStockListEntity.setStoreId(Long.parseLong("12312"));//门店ID
-			distributionStockListEntity.setShoppingMall(warehousingEntryDTO.getClientId());//所属商场
+//			distributionStockListEntity.setShoppingMall(warehousingEntryDTO.getClientId());//所属商场
 
 //			distributionStockListEntity.setMarketCode(warehousingEntryDTO.get);//商场编码
 			distributionStockListEntity.setMarketName(warehousingEntryDTO.getCustomerName());//商场名称