Merge branch 'dev' into pre-production

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataGoodsAreaVO.java

@@ -55,7 +55,26 @@ public class BasicdataGoodsAreaVO extends BasicdataGoodsAreaEntity {
 	 */
 	private String areaTypeName;
 
-
+	/**
+	 * 总货位
+	 */
+	@ApiModelProperty(value = "总货位")
+	private Integer cargoNub;
+	/**
+	 * 使用货位
+	 */
+	@ApiModelProperty(value = "使用货位")
+	private Integer employNub;
+	/**
+	 * 可用货位
+	 */
+	@ApiModelProperty(value = "可用货位")
+	private Integer unusedNub;
+	/**
+	 * 禁用货位
+	 */
+	@ApiModelProperty(value = "禁用货位")
+	private Integer disableNub;
 
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml

@@ -65,7 +65,11 @@
         goods_area.headline,
         goods_area.enable_status,
         goods_area.area_type,
-        warehouse.NAME AS warehouseName
+        warehouse.NAME AS warehouseName,
+        (SELECT	COALESCE (count(*),0) FROM logpm_warehouse_goods_allocation lwga  WHERE goods_area.id = lwga.goods_area_id and lwga.is_deleted =0) cargoNub,
+        (SELECT	COALESCE (count(*),0) FROM logpm_warehouse_goods_allocation lwga  WHERE goods_area.id = lwga.goods_area_id and lwga.is_deleted =0 and lwga.allocation_status =2 ) employNub,
+        (SELECT	COALESCE (count(*),0) FROM logpm_warehouse_goods_allocation lwga  WHERE goods_area.id = lwga.goods_area_id and lwga.is_deleted =0 and lwga.enable_status =2 ) disableNub,
+        (SELECT	COALESCE (count(*),0) FROM logpm_warehouse_goods_allocation lwga  WHERE goods_area.id = lwga.goods_area_id and lwga.is_deleted =0 and lwga.enable_status =1 and  lwga.allocation_status =1 ) unusedNub
         FROM
         logpm_warehouse_goods_area AS goods_area
         INNER JOIN  logpm_warehouse_warehouse AS warehouse ON goods_area.warehouse_id = warehouse.id

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java

@@ -578,7 +578,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 						log.info("行减列不变>>>>>>>>>>>>>>>>>>");
 						//TODO 行减列不变
 						//行减
-						for (Integer z = layerSort.get(layerSort.size()-1).getColumnNum(); z > storeyNum; z--) {
+						for (Integer z = columnSort.get(columnSort.size()-1).getLayerNum(); z > storeyNum; z--) {
 							List<BasicdataGoodsAllocationEntity> basicdataGoodsAllocationEntitiesDate = basicdataGoodsAllocationMapper.selectList(new QueryWrapper<BasicdataGoodsAllocationEntity>().lambda()
 								.eq(BasicdataGoodsAllocationEntity::getLayerNum, z)
 								.eq(BasicdataGoodsAllocationEntity::getGoodsAreaId, basicdataGoodsShelfDTO.getGoodsAreaId())

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java

@@ -139,6 +139,7 @@ public class DistributionParcelListController extends BladeController  {
 	@ApiOperation(value = "分页", notes = "传入distributionParcelList")
 	public R<IPage<DistributionParcelListVO>> page(DistributionParcelListVO distributionParcelList, Query query) {
 		IPage<DistributionParcelListEntity> pages = distributionParcelListService.selectDistributionParcelListPage(Condition.getPage(query), distributionParcelList);
+
 		return R.data(DistributionParcelListWrapper.build().pageVO(pages));
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.java

@@ -42,7 +42,7 @@ public interface DistributionParcelListMapper extends BaseMapper<DistributionPar
 	 * @param distributionParcelList
 	 * @return
 	 */
-	List<DistributionParcelListEntity> selectDistributionParcelListPage(IPage page, DistributionParcelListVO distributionParcelList);
+	List<DistributionParcelListEntity> selectDistributionParcelListPage(IPage page,@Param("param") DistributionParcelListVO distributionParcelList);
 
 
 	/**

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml

@@ -36,7 +36,78 @@
 
 
     <select id="selectDistributionParcelListPage" resultType="com.logpm.distribution.entity.DistributionParcelListEntity">
-        select ldpl.* from logpm_distribution_parcel_list ldpl where ldpl.is_deleted = 0
+        SELECT
+        ldpl.warehouse_id warehouseId,
+        ldpl.id id,
+        lww.name warehouse,
+        ldpl.conditions conditions,
+        ldpl.order_package_code orderPackageCode,
+        ldpl.firsts firsts,
+        ldpl.second second,
+        ldpl.third_product thirdProduct,
+        ldpl.quantity quantity,
+        ldpl.train_number trainNumber,
+        ldpl.stock_article_id stockArticleId,
+        ldpl.order_code orderCode,
+        ldpl.service_number serviceNumber,
+        ldpl.material_id materialId,
+        ldpl.material_name materialName,
+        ldpl.brand_name brandName,
+        ldpl.order_package_freeze_status orderPackageFreezeStatus,
+        ldpl.order_package_grounding_status orderPackageGroundingStatus,
+        ldpl.order_package_stockup_status orderPackageStockupStatus,
+        ldpl.order_package_reservation_status orderPackageReservationStatus,
+        ldpl.order_package_loading_status orderPackageLoadingStatus,
+        ldpl.waybill_number waybillNumber,
+        ldpl.warehouse_entry_time_end warehouseEntryTimeEnd,
+        ldpl.waybill_number waybillNumber,
+        lwug.position_code goodsAllocation,
+        lwtg.tray_code pallet
+        FROM
+        logpm_distribution_parcel_list ldpl
+        LEFT JOIN logpm_warehouse_updown_goods lwug ON ldpl.id = lwug.association_id
+        LEFT JOIN logpm_warehouse_tray_goods lwtg ON ldpl.id = lwtg.association_id
+        left join logpm_warehouse_warehouse lww on lww.id = ldpl.warehouse_id
+        <where>
+            ldpl.is_deleted = 0
+            <if test="param.warehouse !='' and param.warehouse != null">
+             and   lww.name  like concat('%',#{param.warehouse},'%')
+            </if>
+             <if test="param.orderPackageCode !='' and param.orderPackageCode != null">
+             and   ldpl.order_package_code  like concat('%',#{param.orderPackageCode},'%')
+            </if>
+             <if test="param.firsts !='' and param.firsts != null">
+             and   ldpl.firsts = #{param.firsts}
+            </if>
+            <if test="param.thirdProduct !='' and param.thirdProduct != null">
+             and   ldpl.third_product = #{param.thirdProduct}
+            </if>
+              <if test="param.quantity !='' and param.quantity != null">
+             and   ldpl.quantity = #{param.quantity}
+            </if>
+            <if test="param.trainNumber !='' and param.trainNumber != null">
+             and   ldpl.train_number = #{param.trainNumber}
+            </if>
+             <if test="param.stockArticleId !='' and param.stockArticleId != null">
+             and   ldpl.stock_article_id  like concat('%',#{param.stockArticleId},'%')
+            </if>
+            <if test="param.orderCode !='' and param.orderCode != null">
+                and   ldpl.order_code   like concat('%',#{param.orderCode},'%')
+            </if>
+             <if test="param.serviceNumber !='' and param.serviceNumber != null">
+                and   ldpl.service_number  like concat('%',#{param.serviceNumber},'%')
+            </if>
+              <if test="param.materialName !='' and param.materialName != null">
+                and   ldpl.material_name  like concat('%',#{param.materialName},'%')
+            </if>
+             <if test="param.brandName !='' and param.brandName != null">
+                and   ldpl.brand_name like concat('%',#{param.brandName},'%')
+            </if>
+            <if test="param.orderPackageFreezeStatus !='' and param.orderPackageFreezeStatus != null">
+                and   ldpl.order_package_freeze_status  like concat('%',#{param.orderPackageFreezeStatus},'%')
+            </if>
+        </where>
+
     </select>
     <select id="getStockDataBase" resultType="com.logpm.distribution.vo.DistributionParcelListBaseVO">
         select ldsa.waybill_number waybillNumber,ldsa.service_number serviceNumber,ldsa.order_code orderCode,ldsa.mall_name mallName,ldsa.warehouse ,ldsa.brand ,

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java

@@ -51,7 +51,8 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 
 	@Override
 	public IPage<DistributionParcelListEntity> selectDistributionParcelListPage(IPage<DistributionParcelListEntity> page, DistributionParcelListVO distributionParcelList) {
-		return page.setRecords(baseMapper.selectDistributionParcelListPage(page, distributionParcelList));
+		List<DistributionParcelListEntity> distributionParcelListEntities = baseMapper.selectDistributionParcelListPage(page, distributionParcelList);
+		return page.setRecords(distributionParcelListEntities);
 	}
 
 

blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java

@@ -513,7 +513,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService {
 	 * @return
 	 */
 	private String getPeisongTypeByClientId(Long id) {
-		BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(id, 4);
+		BasicdataStoreBusinessEntity basicdataStoreBusinessEntity = basicdataStoreBusinessClient.findByClientIdAndTypeService(id, 3);
 		logger.info(">>>>>>> 查询客户的配送类型{}", basicdataStoreBusinessEntity);
 		if(ObjectUtil.isEmpty(basicdataStoreBusinessEntity)){
 			return null;