1.仓库逻辑修改优化

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="";
+	public static final String DEVAUTH ="-zhy";
 
 	/**
 	 * 工厂对接服务名称

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/WarehouseUpdownGoodsVO.java

@@ -7,4 +7,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class WarehouseUpdownGoodsVO extends WarehouseUpdownGoodsEntity {
+
+	private String orderCode;
+
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseUpdownTypeApiController.java

@@ -322,7 +322,7 @@ public class WarehouseUpdownTypeApiController {
 	public R downScanPackage(@RequestBody UpdownTypeDTO updownTypeDTO ) {
 		String method = "###########downScanPackage: ";
 		log.info(method + "下架扫描包件码 updownTypeDTO={}", updownTypeDTO);
-		String orderPackageCode = updownTypeDTO.getCode();
+		String orderPackageCode = updownTypeDTO.getOrderPackageCode();
 		try{
 			if(StringUtil.isBlank(orderPackageCode)){
 				log.warn(method+"包件码不能为空 orderPackageCode={}",orderPackageCode);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseTrayGoodsMapper.xml

@@ -251,7 +251,7 @@
         FROM logpm_warehouse_tray_goods lwtg
          LEFT JOIN logpm_warehouse_tary_allocation lwta ON lwta.tray_id = lwtg.tray_id AND lwta.is_deleted = 0
         WHERE lwtg.market_id = #{marketId}
-          and lwtg.association_code = #{materialCode}
+          and lwtg.association_value = #{materialCode}
           and lwtg.incoming_batch = #{incomingBatch}
           AND lwta.id IS NULL
     </select>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseUpdownGoodsMapper.xml

@@ -218,13 +218,12 @@
             lwug.allocation_title allocationName,
             lwt.pallet_code trayCode,
             lwug.num num
-        FROM logpm_warehouse_updown_goods lwug ON ldsa.id = lwug.association_id
+        FROM logpm_warehouse_updown_goods lwug
         LEFT JOIN logpm_warehouse_tary_allocation lwta ON lwta.allocation_id = lwug.allocation_id AND lwta.is_deleted = 0
             LEFT JOIN logpm_warehouse_tray lwt ON lwt.id = lwta.tray_id
         WHERE lwug.market_id = #{marketId}
           and lwug.association_value = #{materialCode}
           and lwug.incoming_batch = #{incomingBatch}
-          AND lwta.id IS NOT NULL
     </select>
 
 </mapper>

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsLogService.java

@@ -14,7 +14,7 @@ public interface IWarehouseTrayGoodsLogService extends BaseService<WarehouseTray
 
 	void saveLogZero(DistributionStockArticleEntity stockArticleEntity, WarehouseTrayTypeEntity trayTypeEntity, Integer num, String bindingType, String remark, String palletizingType);
 
-    void saveLogStock(Long materialId,Long marketId, WarehouseTrayTypeEntity trayTypeEntity,String incomingBatch,Integer num, String bindingType, String remark, String palletizingType);
+    void saveLogStock(Long materialId,Long marketId, WarehouseTrayTypeEntity trayTypeEntity,String incomingBatch,String materialCode,Integer num, String bindingType, String remark, String palletizingType);
 
     void saveLogByTrayGoodsList(List<WarehouseTrayGoodsEntity> sourceTrayGoodsList, String bindingType, String remark, String palletizingType);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseTrayGoodsService.java

@@ -50,7 +50,7 @@ public interface IWarehouseTrayGoodsService extends BaseService<WarehouseTrayGoo
 
 	WarehouseTrayGoodsEntity getStockDataByMaterialIdAndMarketId(Long materialId, Long marketId, Long trayTypeId,String incomingBatch);
 
-	void saveEntityStock(Long materialId,Long marketId,WarehouseTrayTypeEntity trayTypeEntity,String incomingBatch,Integer num, String isException);
+	void saveEntityStock(Long materialId,Long marketId,WarehouseTrayTypeEntity trayTypeEntity,String incomingBatch,String materialCode,Integer num, String isException);
 
 
 

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

@@ -51,12 +51,12 @@ public class WarehouseTrayGoodsLogServiceImpl extends BaseServiceImpl<WarehouseT
 	}
 
 	@Override
-	public void saveLogStock(Long materialId,Long marketId, WarehouseTrayTypeEntity trayTypeEntity,String incomingBatch,Integer num, String bindingType, String remark, String palletizingType) {
+	public void saveLogStock(Long materialId,Long marketId, WarehouseTrayTypeEntity trayTypeEntity,String incomingBatch,String materialCode,Integer num, String bindingType, String remark, String palletizingType) {
 		WarehouseTrayGoodsLogEntity trayGoodsLogEntity = new WarehouseTrayGoodsLogEntity();
 		trayGoodsLogEntity.setTrayId(trayTypeEntity.getTrayId());
 		trayGoodsLogEntity.setTrayTypeId(trayTypeEntity.getId());
 		trayGoodsLogEntity.setAssociationId(materialId);
-		trayGoodsLogEntity.setAssociationValue(null);
+		trayGoodsLogEntity.setAssociationValue(materialCode);
 		trayGoodsLogEntity.setAssociationType("4");
 		trayGoodsLogEntity.setBindingType(bindingType);
 		trayGoodsLogEntity.setRemark(remark);

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

@@ -165,7 +165,7 @@ public class WarehouseTrayGoodsServiceImpl extends BaseServiceImpl<WarehouseTray
 	}
 
 	@Override
-	public void saveEntityStock(Long materialId,Long marketId,WarehouseTrayTypeEntity trayTypeEntity,String  incomingBatch,Integer num, String isException) {
+	public void saveEntityStock(Long materialId,Long marketId,WarehouseTrayTypeEntity trayTypeEntity,String  incomingBatch,String materialCode,Integer num, String isException) {
 		WarehouseTrayGoodsEntity trayGoodsEntity = new WarehouseTrayGoodsEntity();
 		trayGoodsEntity.setTrayId(trayTypeEntity.getTrayId());
 		trayGoodsEntity.setTrayCode(trayTypeEntity.getTrayCode());

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

@@ -939,20 +939,20 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		if(chuanFlag){
 			if(Objects.isNull(warehouseTrayGoodsEntity)){
 				//存入有数据库存品与托盘绑定关系表
-				warehouseTrayGoodsService.saveEntityStock(materialId, marketId,trayTypeEntity,incomingBatch,1, "1");
+				warehouseTrayGoodsService.saveEntityStock(materialId, marketId,trayTypeEntity,incomingBatch,materialCode,1, "1");
 			}else{
 				warehouseTrayGoodsService.updateEntityStock(warehouseTrayGoodsEntity,1);
 			}
 		}else{
 			if(Objects.isNull(warehouseTrayGoodsEntity)){
 				//存入有数据库存品与托盘绑定关系表
-				warehouseTrayGoodsService.saveEntityStock(materialId, marketId,trayTypeEntity,incomingBatch,1, "0");
+				warehouseTrayGoodsService.saveEntityStock(materialId, marketId,trayTypeEntity,incomingBatch,materialCode,1, "0");
 			}else{
 				warehouseTrayGoodsService.updateEntityStock(warehouseTrayGoodsEntity,-1);
 			}
 		}
 //		//添加上拖日志表
-		warehouseTrayGoodsLogService.saveLogStock(materialId, marketId,trayTypeEntity,incomingBatch,1, "1", "分拣打托:有数据库存品 分拣", "1");
+		warehouseTrayGoodsLogService.saveLogStock(materialId, marketId,trayTypeEntity,incomingBatch,materialCode,1, "1", "分拣打托:有数据库存品 分拣", "1");
 
 		updateNumByTrayTypeId(trayTypeEntity);
 
@@ -975,6 +975,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		Long trayTypeId = trayGoodsEntity.getTrayTypeId();
 		Integer num = trayGoodsEntity.getNum();
 		Long materialId = trayGoodsEntity.getAssociationId();
+		String materialCode = trayGoodsEntity.getAssociationValue();
 		Long marketId = trayGoodsEntity.getMarketId();
 		Long trayId = trayGoodsEntity.getTrayId();
 		String incomingBatch = trayGoodsEntity.getIncomingBatch();
@@ -1003,7 +1004,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		}
 
 		//添加下托日志
-		warehouseTrayGoodsLogService.saveLogStock(materialId,marketId,trayTypeEntity,incomingBatch,num,"0","分拣打托:有数据库存品分拣","2");
+		warehouseTrayGoodsLogService.saveLogStock(materialId,marketId,trayTypeEntity,incomingBatch,materialCode,num,"0","分拣打托:有数据库存品分拣","2");
 
 		updateNumByTrayTypeId(trayTypeEntity);
 
@@ -1137,6 +1138,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		}
 		String marketName = stockListEntity.getMarketName();
 		Long materialId = stockListEntity.getMaterialId();
+		String cargoNumber = stockListEntity.getCargoNumber();
 		BasicMaterialEntity materialEntity = basicMaterialClient.getMaterialOwnId(materialId);
 		if(Objects.isNull(materialEntity)){
 			log.warn("#########saveTrayTypeByStock: 未找到物料信息 materialId={}",materialId);
@@ -1193,20 +1195,20 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		if(chuanFlag){
 			if(Objects.isNull(warehouseTrayGoodsEntity)){
 				//存入有数据库存品与托盘绑定关系表
-				warehouseTrayGoodsService.saveEntityStock(materialId, marketId,trayTypeEntity,incomingBatch,num, "1");
+				warehouseTrayGoodsService.saveEntityStock(materialId, marketId,trayTypeEntity,incomingBatch,cargoNumber,num, "1");
 			}else{
 				warehouseTrayGoodsService.updateEntityStock(warehouseTrayGoodsEntity,num);
 			}
 		}else{
 			if(Objects.isNull(warehouseTrayGoodsEntity)){
 				//存入有数据库存品与托盘绑定关系表
-				warehouseTrayGoodsService.saveEntityStock(materialId, marketId,trayTypeEntity,incomingBatch,num, "0");
+				warehouseTrayGoodsService.saveEntityStock(materialId, marketId,trayTypeEntity,incomingBatch,cargoNumber,num, "0");
 			}else{
 				warehouseTrayGoodsService.updateEntityStock(warehouseTrayGoodsEntity,-num);
 			}
 		}
 //		//添加上拖日志表
-		warehouseTrayGoodsLogService.saveLogStock(materialId, marketId,trayTypeEntity,incomingBatch,num, "1", "分拣打托:无数据库存品 分拣", "1");
+		warehouseTrayGoodsLogService.saveLogStock(materialId, marketId,trayTypeEntity,incomingBatch,cargoNumber,num, "1", "分拣打托:无数据库存品 分拣", "1");
 
 		updateNumByTrayTypeId(trayTypeEntity);
 
@@ -1251,6 +1253,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		WarehouseTrayGoodsEntity trayGoodsEntity = warehouseTrayGoodsService.getById(trayGoodsId);
 		Long trayTypeId = trayGoodsEntity.getTrayTypeId();
 		Long materialId = trayGoodsEntity.getAssociationId();
+		String materialCode = trayGoodsEntity.getAssociationValue();
 		Long marketId = trayGoodsEntity.getMarketId();
 		String incomingBatch = trayGoodsEntity.getIncomingBatch();
 		WarehouseTrayTypeEntity trayTypeEntity = baseMapper.selectById(trayTypeId);
@@ -1258,7 +1261,7 @@ public class WarehouseTrayTypeServiceImpl extends BaseServiceImpl<WarehouseTrayT
 		warehouseTrayGoodsService.updateEntityStock(trayGoodsEntity,enterNum);
 
 		//添加下托日志 Long materialId,Long marketId, WarehouseTrayTypeEntity trayTypeEntity,Integer num, String bindingType, String remark, String palletizingType
-		warehouseTrayGoodsLogService.saveLogStock(materialId,marketId,trayTypeEntity,incomingBatch,Math.abs(enterNum),"0","下架:库存品部分下架","2");
+		warehouseTrayGoodsLogService.saveLogStock(materialId,marketId,trayTypeEntity,incomingBatch,materialCode,Math.abs(enterNum),"0","下架:库存品部分下架","2");
 
 		updateNumByTrayTypeId(trayTypeEntity);
 	}

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

@@ -170,10 +170,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 				throw new CustomerException(403,"包件信息不存在");
 			}
 			String orderPackageGroundingStatus = parcelListEntity.getOrderPackageGroundingStatus();
-			if("20".equals(orderPackageGroundingStatus)){
+//			if("20".equals(orderPackageGroundingStatus)){
-				log.warn("#################findUpShelfScanGoods: 包件已上架 code={}",code);
+//				log.warn("#################findUpShelfScanGoods: 包件已上架 code={}",code);
-				throw new CustomerException(403,"包件已上架");
+//				throw new CustomerException(403,"包件已上架");
-			}
+//			}
 			List<UpShelfDataVO> ls = new ArrayList<>();
 			UpShelfDataVO dataVO = new UpShelfDataVO();
 			dataVO.setOrderCode(parcelListEntity.getOrderCode());
@@ -749,7 +749,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			log.warn("##########downScanPackage: 包件信息不存在 orderPackageCode={}",orderPackageCode);
 			return R.fail(403,"包件信息不存在");
 		}
-		return R.data(updownGoodsEntity);
+		WarehouseUpdownGoodsVO updownGoodsVO = new WarehouseUpdownGoodsVO();
+		BeanUtil.copy(updownGoodsEntity,updownGoodsVO);
+		updownGoodsVO.setOrderCode(parcelListEntity.getOrderCode());
+		return R.data(updownGoodsVO);
 	}
 
 	@Override