Merge remote-tracking branch 'origin/dev' into pre-production

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java

@@ -189,4 +189,6 @@ public class LoadCarsDTO implements Serializable {
 	private List<TrunklineCarsLoadLinePhotoEntity> addUrlList = new ArrayList<>();
 	private List<Long> removeUrlList = new ArrayList<>();
 
+	private Long endWarehouseId;
+
 }

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

@@ -399,21 +399,27 @@
     </select>
 
     <select id="listAllocationOrder" resultType="com.logpm.distribution.vo.DistributionStockListAllocationVO">
-        select lwug.position_code allocationTitle,
+        SELECT
+        lwga.qr_code AS allocationTitle,
         lwug.allocation_id,
-        ldsi.market_name marketName,
+        ldsi.market_name AS marketName,
-        sum(lwug.num) num,
+        sum( lwug.num ) AS num,
-        lwug.create_time createTime,
+        lwug.create_time AS createTime,
-        ldsi.cargo_unit cargoUnit,
+        ldsi.cargo_unit AS cargoUnit,
         ldsi.unpack,
-        ldsi.quantity_stock quantityStock,
+        ldsi.quantity_stock AS quantityStock,
-        ldsi.unpacking_quantity unpackingQuantity,
+        ldsi.unpacking_quantity AS unpackingQuantity,
-        ldsi.description_goods descriptionGoods
+        ldsi.description_goods AS descriptionGoods
         FROM
         logpm_distribution_stock_list ldsi
-        left join logpm_distribution_stock_list_info ldsli on ldsli.material_id = ldsi.material_id AND ldsli.warehouse_id = ldsi.warehouse_id
+        LEFT JOIN logpm_distribution_stock_list_info ldsli ON ldsli.material_id = ldsi.material_id
-        AND ldsi.market_id = ldsli.market_id and ldsli.incoming_batch = ldsi.incoming_batch
+        AND ldsli.warehouse_id = ldsi.warehouse_id
-        LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsli.parcel_list_id = lwug.association_id and lwug.association_type = '3'
+        AND ldsi.market_id = ldsli.market_id
+        AND ldsli.incoming_batch = ldsi.incoming_batch
+        AND ldsli.tenant_id = '627683'
+        LEFT JOIN logpm_warehouse_updown_goods lwug ON ldsli.parcel_list_id = lwug.association_id
+        AND lwug.association_type = '3'
+        LEFT JOIN logpm_warehouse_goods_allocation AS lwga ON lwga.id = lwug.allocation_id
         <where>
             lwug.id is not null
             <if test="param.id != null "> and  ldsi.id = #{param.id}</if>

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

@@ -264,7 +264,6 @@
         logpm_distribution_stockup lds
         LEFT JOIN logpm_distribution_stockup_info ldsi ON ldsi.stockup_id = lds.id
         LEFT JOIN logpm_distribution_reservation ldr ON ldsi.reservation_id = ldr.id
-        LEFT JOIN logpm_distribution_reservation_package ldrp ON ldrp.reservation_id = ldsi.reservation_id
         <where>
             lds.is_deleted = 0  AND ldsi.stock_status != 4
 

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

@@ -601,6 +601,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					if (isAutoWarehouse == Integer.parseInt(IsOrNoConstant.yes.getValue()) && !Objects.isNull(defaultGoodsAllocation)){
 						//进行此包件的默认上架
 						warehouseUpdownTypeClient.upShelfPackage( i.getOrderPackageCode(),defaultGoodsAllocation.getId(),myCurrentWarehouse.getId(),"自动上架");
+
 					}
 				});
 				DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
@@ -1052,7 +1053,10 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					warehouseUpdownGoodsEntity.setAssociationValue(distributionParcelListEntity.getOrderPackageCode());
 					WarehouseUpdownGoodsEntity locationInformation = warehouseUpdownGoodsClient.getLocationInformation(warehouseUpdownGoodsEntity);
 					if (Func.isNotEmpty(locationInformation)) {
-						distributionStockListInfo.setStorageLocation(locationInformation.getAllocationTitle());
+						BasicdataGoodsAllocationEntity entityByAllocationId = allocationClient.getEntityByAllocationId(locationInformation.getAllocationId());
+						if (!Objects.isNull(entityByAllocationId)){
+							distributionStockListInfo.setStorageLocation(entityByAllocationId.getQrCode());
+						}
 					}
 					distributionStockListInfo.setFactory(distributionStockArticleEntity.getFactoryTrain());
 					distributionStockListInfo.setDespatch(distributionStockArticleEntity.getTrainNumber());

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

@@ -9126,21 +9126,23 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	 */
 	private DistributionLoadscanEntity updateSignDistributionLoadscanEntity(DistributionLoadscanEntity loadscanEntity, BladeUser user, DistributionParcelListEntity parcelListEntity) {
 		String now = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS").format(new Date());
-		loadscanEntity.setSigningTime(now);
+		DistributionLoadscanEntity distributionLoadscanEntity = new DistributionLoadscanEntity();
-		loadscanEntity.setSignforState(2);
+		distributionLoadscanEntity.setId(loadscanEntity.getId());
-		loadscanEntity.setOneClick(1);
+		distributionLoadscanEntity.setSigningTime(now);
-		loadscanEntity.setOneQclick(1);
+		distributionLoadscanEntity.setSignforState(2);
-		loadscanEntity.setIsInsert(2);
+		distributionLoadscanEntity.setOneClick(1);
-		loadscanEntity.setReceivedQuantity(parcelListEntity.getQuantity());
+		distributionLoadscanEntity.setOneQclick(1);
-		loadscanEntity.setSigningUser(user.getNickName());
+		distributionLoadscanEntity.setIsInsert(2);
-		loadscanEntity.setSigningUserId(user.getUserId());
+		distributionLoadscanEntity.setReceivedQuantity(parcelListEntity.getQuantity());
-		loadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
+		distributionLoadscanEntity.setSigningUser(user.getNickName());
-		loadscanEntity.setSignforState(LoadScanSigningStatusConstant.weiqianshou.getValue());
+		distributionLoadscanEntity.setSigningUserId(user.getUserId());
+		distributionLoadscanEntity.setSignforType(LoadScanSigningTypeStatusConstant.sijiqianshou.getValue());
+		distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.weiqianshou.getValue());
 		if (loadscanEntity.getLoadedNub().equals(loadscanEntity.getReceivedQuantity())) {
-			loadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
+			distributionLoadscanEntity.setSignforState(LoadScanSigningStatusConstant.yiqianshou.getValue());
 		}
 
-		return loadscanEntity;
+		return distributionLoadscanEntity;
 
 	}
 

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/CarsLoadController.java

@@ -53,9 +53,17 @@ public class CarsLoadController {
 
 			//当前登录人选择的仓库
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			List<Long> warehouseIds = new ArrayList<>();
 			if(!Objects.isNull(myCurrentWarehouse)){
-				loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
+				Long warehouseId = myCurrentWarehouse.getId();
+				warehouseIds.add(warehouseId);
+			}else{
+				List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
+				myWatchWarehouse.forEach(warehouseEntity -> {
+					warehouseIds.add(warehouseEntity.getId());
+				});
 			}
+			loadCarsDTO.setWarehouseIds(warehouseIds);
 
 			IPage<TrunklineCarsLoadVO> pages = carsLoadService.loadCarsPageList(loadCarsDTO);
 
@@ -80,9 +88,18 @@ public class CarsLoadController {
 
 			//当前登录人选择的仓库
 			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			List<Long> warehouseIds = new ArrayList<>();
 			if(!Objects.isNull(myCurrentWarehouse)){
-				loadCarsDTO.setWarehouseId(myCurrentWarehouse.getId());
+				Long warehouseId = myCurrentWarehouse.getId();
+				warehouseIds.add(warehouseId);
+			}else{
+				List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
+				myWatchWarehouse.forEach(warehouseEntity -> {
+					warehouseIds.add(warehouseEntity.getId());
+				});
 			}
+			loadCarsDTO.setWarehouseIds(warehouseIds);
+
 			IPage<TrunklineCarsLoadVO> pages = carsLoadService.arriveCarsPageList(loadCarsDTO);
 			return R.data(pages);
 		}catch (CustomerException e){

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml

@@ -42,9 +42,18 @@
         where ltcl.is_deleted = 0
           and ltcl.load_type != '4'
           and ltcl.load_status != '100'
+        <if test="param.warehouseIds != null and param.warehouseIds.size() > 0" >
+            and ltcl.start_warehouse_id in
+            <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="param.warehouseId != null" >
             and ltcl.start_warehouse_id = #{param.warehouseId}
         </if>
+        <if test="param.endWarehouseId != null" >
+            and Locate(#{param.endWarehouseId},ltcl.end_warehouse_ids) > 0
+        </if>
         <if test="param.loadCarsNo != null and param.loadCarsNo != ''">
             and ltcl.cars_no = #{param.loadCarsNo}
         </if>
@@ -132,9 +141,18 @@
         where ltcl.is_deleted = 0
         and ltcl.load_status != '100'
         and ltcl.load_type != '4'
+        <if test="param.warehouseIds != null and param.warehouseIds.size() > 0" >
+            and ltcl.start_warehouse_id in
+            <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="param.warehouseId != null" >
             and ltcl.end_warehouse_ids like concat('%',#{param.warehouseId},'%')
         </if>
+        <if test="param.endWarehouseId != null" >
+            and Locate(#{param.endWarehouseId},ltcl.end_warehouse_ids) > 0
+        </if>
         <if test="param.warehouseName != null and param.warehouseName != ''">
             and (Locate(#{param.warehouseName},ltcl.start_warehouse_name) > 0 or Locate(#{param.warehouseName},ltcl.end_warehouse_names) > 0)
         </if>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@@ -2974,6 +2974,13 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 		}
 		for (QuestDetailEntity i : questDetailEntityList) {
 			if (i.getQuestStatus().equals(1)) {
+				if (!Objects.isNull(i.getAllocationId())){
+					BasicdataGoodsAllocationEntity entityByAllocationId = basicdataGoodsAllocationClient.getEntityByAllocationId(Long.parseLong(i.getAllocationId()));
+					if (Objects.isNull(entityByAllocationId)){
+						return Resp.scanFail("当前包件在"+entityByAllocationId.getQrCode()+"已盘点！", "当前包件在"+entityByAllocationId.getQrCode()+"已盘点！");
+					}
+				}
+
 				return Resp.scanFail("当前包件已盘点！", "当前包件已盘点！");
 			}
 		}