PDA备货调整

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAllocationClient.java

@@ -81,7 +81,7 @@ public interface IBasicdataGoodsAllocationClient {
 	 * @return
 	 */
 	@GetMapping(API_PREFIX+"/scanStockUpAllocationByCode")
-	BasicdataGoodsAllocationEntity scanStockUpAllocationByCode(String stockUpAreaCode);
+	BasicdataGoodsAllocationEntity scanStockUpAllocationByCode(Long stockUpAreaCode);
 
 	/**
 	 * 查询库位的完整名称，按照货区-货架-货位的方式呈现

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataGoodsAllocationClient.java

@@ -106,7 +106,7 @@ public class BasicdataGoodsAllocationClient implements IBasicdataGoodsAllocation
 	}
 
 	@Override
-	public BasicdataGoodsAllocationEntity scanStockUpAllocationByCode(String stockUpAreaCode) {
+	public BasicdataGoodsAllocationEntity scanStockUpAllocationByCode(Long stockUpAreaCode) {
 		return basicdataGoodsAllocationService.scanStockUpAllocationByCode(stockUpAreaCode);
 	}
 

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

@@ -78,4 +78,11 @@ public interface BasicdataGoodsAllocationMapper extends BaseMapper<BasicdataGood
 	List<BasicdataNodeVO> selectFourthNode(@Param("warehouseId") String warehouseId,@Param("areaId") String areaId,@Param("goodsShelfId") String goodsShelfId);
 
 	String getAllocationIntegrityName(@Param("goodsAllocationId") Long goodsStockupAllocationId);
+
+	/**
+	 * 查询托盘完整信息
+	 * @param stockUpAreaCode
+	 * @return
+	 */
+	BasicdataGoodsAllocationEntity getAllocationIntegrityEntity(@Param("id") Long stockUpAreaCode);
 }

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

@@ -183,4 +183,44 @@
         WHERE
         lwga.id = #{goodsAllocationId}
     </select>
+    <select id="getAllocationIntegrityEntity"
+            resultType="com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity">
+        SELECT
+        CONCAT_WS( '-', lwgaa.headline, lwgs.goods_shelf_name, lwga.goods_allocation_name ) AS goodsAllocationName,
+        lwga.id,
+        lwga.tenant_id,
+        lwga.create_user,
+        lwga.create_time,
+        lwga.update_user,
+        lwga.update_time,
+        lwga.status,
+        lwga.is_deleted,
+        lwga.create_dept,
+        lwga.reserve1,
+        lwga.reserve2,
+        lwga.reserve3,
+        lwga.reserve4,
+        lwga.reserve5,
+        lwga.goods_area_id,
+        lwga.warehouse_name,
+        lwga.warehouse_id,
+        lwga.goods_shelf_id,
+        lwga.row_num,
+        lwga.enable_status,
+        lwga.allocation_status,
+        lwga.storey_num,
+        lwga.qr_code,
+        lwga.qr_code_url,
+        lwga.column_num,
+        lwga.layer_num,
+        lwga.template_id,
+        lwga.old_id,
+        lwga.old_qr_code
+        FROM
+        logpm_warehouse_goods_allocation AS lwga
+        LEFT JOIN logpm_warehouse_goods_shelf AS lwgs ON lwga.goods_shelf_id = lwgs.id
+        LEFT JOIN logpm_warehouse_goods_area AS lwgaa ON lwga.goods_area_id = lwgaa.id
+        WHERE
+        lwga.id = #{id}
+    </select>
 </mapper>

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAllocationService.java

@@ -116,7 +116,7 @@ public interface IBasicdataGoodsAllocationService extends BaseService<BasicdataG
 	 * @param stockUpAreaCode
 	 * @return
 	 */
-	BasicdataGoodsAllocationEntity scanStockUpAllocationByCode(String stockUpAreaCode);
+	BasicdataGoodsAllocationEntity scanStockUpAllocationByCode(Long stockUpAreaCode);
 
 	List<BasicdataNodeVO> getStockUpAllocation();
 

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

@@ -299,9 +299,9 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl<Basicda
 	}
 
 	@Override
-	public BasicdataGoodsAllocationEntity scanStockUpAllocationByCode(String stockUpAreaCode) {
+	public BasicdataGoodsAllocationEntity scanStockUpAllocationByCode(Long stockUpAreaCode) {
 
-		return this.getById(stockUpAreaCode);
+		return baseMapper.getAllocationIntegrityEntity(stockUpAreaCode);
 	}
 
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -200,7 +200,6 @@ public class DistributionStockupAppController extends BladeController {
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "检查备货区", notes = "传入stockupDTO")
 	public R inspectArea(@RequestParam String fragment) {
-
 	return R.data(basicdataGoodsAllocationClient.findListStockUpAllocationByName(fragment))	;
 	}
 
@@ -208,7 +207,7 @@ public class DistributionStockupAppController extends BladeController {
 	@GetMapping("/scanStockUpArea")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "检查备货区", notes = "传入stockupDTO")
-	public R scanStockUpArea(@RequestParam String stockUpAreaCode) {
+	public R scanStockUpArea(@RequestParam Long stockUpAreaCode) {
 		BasicdataGoodsAllocationEntity basicdataGoodsAllocationEntity = basicdataGoodsAllocationClient.scanStockUpAllocationByCode(stockUpAreaCode);
 		Long goodsAreaId = basicdataGoodsAllocationEntity.getGoodsAreaId();
 		BasicdataGoodsAreaEntity entityByGoodsAreaId = basicdataGoodsAreaClient.getEntityByGoodsAreaId(goodsAreaId);
@@ -692,8 +691,8 @@ public class DistributionStockupAppController extends BladeController {
 		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
 		if (Func.isEmpty(myCurrentWarehouse)){
 			return R.data(403, "未授权！");
-
 		}
+
 		if (scanType == 2) {
 			//库存品扫描
 			Long stockListId = stockupDTO.getStockListId();
@@ -1183,6 +1182,13 @@ public class DistributionStockupAppController extends BladeController {
 			log.warn("##################allocationId: 货位ID为空！");
 			return R.fail("货位ID不能为空");
 		}
+		if (Objects.isNull(stockupDTO.getGoodsStockupAllocationId())) {
+			log.warn("##################allocationId: 货位ID为空！");
+			return R.fail("备货货位ID不能为空");
+		}
+
+		//查询备货库位信息
+		String allocationIntegrityName = basicdataGoodsAllocationClient.getAllocationIntegrityName(stockupDTO.getGoodsStockupAllocationId());
 		//判断是否可以继续备货
 			DistributionStockListEntity byId = null;
 //		if (ObjectUtils.isNull(stockListId)) {
@@ -1450,7 +1456,12 @@ public class DistributionStockupAppController extends BladeController {
 						entity.setType(2);
 						entity.setAllocationId(stockupDTO.getAllocationId());
 						entity.setOutboundType(stockupEntity.getTypeService());
+						entity.setGoodsStockupAllocationId(stockupDTO.getGoodsStockupAllocationId());
+						entity.setStockupArea(allocationIntegrityName);
+
 						distributionStockService.save(entity);
+						distributionStockService.maintenanceStockUpArea(entity.getStockupId(),allocationIntegrityName);
+
 //								dataSourceTransactionManager.commit(transactionStatus);//提交
 
 						Map<String, Object> map = new HashMap<>();
@@ -1551,6 +1562,14 @@ public class DistributionStockupAppController extends BladeController {
 			return R.fail("包件扫码:预约单id不能为空");
 		}
 
+		//		------------------2023-12-14   增加扫描
+
+//		if (Func.isEmpty(stockupDTO.getGoodsStockupAllocationId())){
+//			return Resp.scanFail("无备货库位信息", "无备货库位信息！");
+//		}
+//		-------------------------------------------------------
+
+		String allocationIntegrityName = basicdataGoodsAllocationClient.getAllocationIntegrityName(stockupDTO.getGoodsStockupAllocationId());
 		Integer integer = distributionStockupService.selectPackage(stockupDTO);
 		switch (integer) {
 			case 1:
@@ -1594,7 +1613,10 @@ public class DistributionStockupAppController extends BladeController {
 				entity.setConditions("0");
 				entity.setType(2);
 				entity.setOutboundType(distributionStockupEntity.getTypeService());
+				entity.setGoodsStockupAllocationId(stockupDTO.getGoodsStockupAllocationId());
+				entity.setStockupArea(allocationIntegrityName);
 				distributionStockService.save(entity);
+				distributionStockService.maintenanceStockUpArea(entity.getStockupId(), allocationIntegrityName);
 				//修改订单备货状态
 				distributionAsyncService.updateStockArticleStock(one.getStockArticleId());
 //						dataSourceTransactionManager.commit(transactionStatus);//提交

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java

@@ -49,6 +49,8 @@ public class StockupDTO implements Serializable {
 	private Long userId;//当前操作人
 	private String deliveryDetailsId;//订单库存ID
 
+	private Long goodsStockupAllocationId;//备货库位ID
+
 	//扫码参数
 	private Integer scanType;//备货扫码类型 1 包件 2库存品
 	private String packetBarCode;//包件码

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockService.java

@@ -74,6 +74,7 @@ public interface IDistributionStockService extends BaseService<DistributionStock
 	 * @return
 	 */
 	void  getUpdateOrderState(Long pageId,int type,Integer num);
+	void maintenanceStockUpArea(Long pageId,String allocationIntegrityName);
 
 
 	Integer selectCount(Long id,Long parseLong);

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

@@ -377,7 +377,8 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 
 	}
 
-	private void maintenanceStockUpArea(Long pageId,String allocationIntegrityName) {
+	@Override
+	public void maintenanceStockUpArea(Long pageId, String allocationIntegrityName) {
 		DistributionStockupEntity distributionStockupEntity = distributionStockupMapper.selectById(pageId);
 		if (Func.isBlank(distributionStockupEntity.getStockupArea())){
 			distributionStockupEntity.setStockupArea(allocationIntegrityName);