拆包物料修改、配送签收库存品BUG修复、自提订单BUG修复

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicMaterialClient.java

@@ -25,6 +25,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 物料基础信息 Feign接口类
  *
@@ -84,4 +86,7 @@ public interface IBasicMaterialClient {
 
 	@GetMapping(API_PREFIX+"/findEntityByName")
 	BasicMaterialEntity findEntityByName(@RequestParam String productName);
+
+	 @GetMapping(API_PREFIX+"/findEntityByPid")
+	 List<BasicMaterialEntity> findEntityByPid(@RequestParam Long pid);
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/controller/BasicMaterialController.java

@@ -90,6 +90,23 @@ public class BasicMaterialController extends BladeController {
 	}
 
 
+	/**
+	 * 查询子物料
+	 */
+	@GetMapping("/findPidList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicMaterial")
+	public R<List<BasicMaterialEntity>> findPidList(@ApiIgnore @RequestParam Map<String, Object> basicMaterial) {
+		QueryWrapper<BasicMaterialEntity> queryWrapper = Condition.getQueryWrapper(basicMaterial, BasicMaterialEntity.class);
+		queryWrapper.orderByDesc("create_time");
+		if (Func.isNotEmpty(basicMaterial.get("pid"))){
+			queryWrapper.lambda().eq(BasicMaterialEntity::getPid, Long.parseLong((String) basicMaterial.get("pid")));
+		}
+		List<BasicMaterialEntity> pages = basicMaterialService.list( queryWrapper);
+		return R.data(pages);
+	}
+
+
 	/**
 	 * 物料基础信息 自定义分页
 	 */

blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicMaterialClient.java

@@ -31,6 +31,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+
 /**
  * 物料基础信息 Feign实现类
  *
@@ -119,4 +121,13 @@ public class BasicMaterialClient implements IBasicMaterialClient {
 		return one;
 	}
 
+	/**
+	 * @param pid
+	 * @return
+	 */
+	@Override
+	public List<BasicMaterialEntity> findEntityByPid(Long pid) {
+		return basicMaterialService.list(Wrappers.<BasicMaterialEntity>query().lambda().eq(BasicMaterialEntity::getPid,pid));
+	}
+
 }

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

@@ -28,5 +28,6 @@ public class DistributionStockArticleOweDTO extends DistributionStockArticleEnti
 	private String reservation;
 	private String startDate;
 	private String entDate;
+	private String isAll;
 	private List<Long> warehouseIdList;
 }

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

@@ -473,6 +473,8 @@
             <if test="  param.startDate != null  ">and ldsa.warehouse_entry_time between #{param.startDate} and
                 #{param.entDate}
             </if>
+            <if test="  param.isAll != null  ">and ldsa.hand_quantity > 0
+            </if>
             <if test="  param.warehouseEntryTime != null  ">and DATE(ldsa.warehouse_entry_time) =
                 #{param.warehouseEntryTime}
             </if>
@@ -518,6 +520,8 @@
             </if>
             <if test="  param.typeService != null and param.groundingStatus != '' ">and ldsa.type_service like concat('%',#{param.typeService},'%')
             </if>
+            <if test="  param.typeService != null and  param.typeService = '3' ">and ldsa.type_service like concat('%',#{param.typeService},'%')
+            </if>
             <if test="  param.customerName != null  and param.customerName != ''  ">and ldsa.customer_name like
                 concat('%',#{param.customerName},'%')
             </if>

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

@@ -6842,6 +6842,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.yizhuangche.getValue());
 			} else {
 				deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.bunfenzhuangche.getValue());
+				deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue());
 			}
 			if (loadingNum == 0) {
 				deliveryListEntity.setDeliveryListLoadingStatus(DeliveryLoadingStatusConstant.weizhuangche.getValue());

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

@@ -2921,7 +2921,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					distributionLoadscaninvnEntity.setInventoryPackageId(inventory.get(0).getId());
 					distributionLoadscaninvnEntity.setDeliveryId(distrilbutionloadingscanDTO.getDeliveryId());
 					distributionLoadscaninvnEntity.setReservationId(distrilbutionloadingscanDTO.getReservationId());
-					distributionLoadscaninvnEntity.setScanUser(user.getUserName());
+					distributionLoadscaninvnEntity.setScanUser(user.getNickName());
 					distributionLoadscaninvnEntity.setScanTime(simpleDateFormat.format(new Date()));
 					distributionLoadscaninvnEntity.setPackageNub(inventory.get(0).getNum());
 					distributionLoadscaninvnEntity.setScanStatus(LoadingStatusConstant.yijianzhuangche.getValue());
@@ -2934,7 +2934,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					distributionLoadscaninvnEntity.setOneClick(1);
 					distributionLoadscaninvnEntity.setOneQclick(1);
 					distributionLoadscaninvnEntity.setLoadedNub(1);
-					distributionLoadscaninvnEntity.setSigningUser(user.getUserName());
+					distributionLoadscaninvnEntity.setSigningUser(user.getNickName());
 					distributionLoadscaninvnEntity.setSigningUserId(user.getUserId());
 					distributionLoadscaninvnEntity.setSigningTime(simpleDateFormat.format(new Date()));
 					distributionLoadscaninvnService.save(distributionLoadscaninvnEntity);
@@ -2955,6 +2955,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				//进行库存品包件状态维护
 				DisStockListDetailEntity disStockListDetailEntity = new DisStockListDetailEntity();
 				disStockListDetailEntity.setId(inventory.get(0).getId());
+				log.info("#################修改库存品包件完成状态:{},",inventory.get(0).getId());
 				disStockListDetailEntity.setStockLockingStatus(InventoryLoadingStatusConstant.yizhuangche.getValue());
 				disStockListDetailEntity.setStockSignfoStatus(InventorySigningStatusConstant.yiqianshou.getValue());
 				disStockListDetailService.updateById(disStockListDetailEntity);

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

@@ -234,7 +234,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 		}
 
 
-		DistributionStockListEntity one2 = this.getOne(Wrappers.<DistributionStockListEntity>query().lambda()
+ 		DistributionStockListEntity one2 = this.getOne(Wrappers.<DistributionStockListEntity>query().lambda()
 			.eq(ObjectUtil.isNotEmpty(distributionStockListDTO.getMaterialId()),DistributionStockListEntity::getMaterialId, distributionStockListDTO.getMaterialId())
 			.eq(DistributionStockListEntity::getPid, distributionStockListDTO.getId())
 			.eq(DistributionStockListEntity::getMarketId, distributionStockListDTO.getMarketId())
@@ -261,6 +261,8 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 			d.setWarehouseId(myCurrentWarehouse.getId());
 			d.setWarehouseName(myCurrentWarehouse.getName());
 			this.updateById(d);
+
+
 			//新增入库记录
 			BeanUtil.copyProperties(d, distributionStockListInfo);
 			distributionStockListInfo.setId(null);
@@ -289,19 +291,30 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 				return false;
 			}
 			//查询物是否是新增的，如果是新增物料则需要进行物料信息的保存
-			BasicMaterialEntity materialByProductCode = basicMaterialClient.getMaterialByProductCode(distributionStockListDTO.getCargoNumber());
-			if (Func.isEmpty(materialByProductCode)) {
-				basicMaterialEntity.setName(distributionStockListDTO.getMaterialIdName());
-				basicMaterialEntity.setProductCode(distributionStockListDTO.getCargoNumber());
+			//查询此物料存在多少子集
+			int a =1;
+			if (Func.isEmpty(distributionStockListDTO.getCargoNumber())) {
+				List<BasicMaterialEntity> materialByProductCode = basicMaterialClient.findEntityByPid(distributionStockListDTO.getId());
+				if (Func.isEmpty(materialByProductCode)){
+					a = materialByProductCode.size()+1;
+				}
+				basicMaterialEntity.setName(one.getDescriptionGoods()+"-"+a);
+				basicMaterialEntity.setProductCode(one.getCargoNumber()+"-"+a);
 				basicMaterialEntity.setPackingSpecification(distributionStockListDTO.getCargoNorms());
 				basicMaterialEntity.setSku(distributionStockListDTO.getSku());
 				basicMaterialEntity.setPackageNum(distributionStockListDTO.getPackageNum() + "");
-				basicMaterialEntity.setPackageNum(distributionStockListDTO.getPackageNum() + "");
 				basicMaterialEntity.setLogpmUnit(distributionStockListDTO.getCargoUnit());
-				basicMaterialEntity.setPid(distributionStockListDTO.getMaterialId());
+				basicMaterialEntity.setSpecification(distributionStockListDTO.getCargoNorms());
+				basicMaterialEntity.setExtent("0");
+				basicMaterialEntity.setBreadth("0");
+				basicMaterialEntity.setAltitude("0");
+				basicMaterialEntity.setVolume("0");
+				basicMaterialEntity.setWeight("0");
+				basicMaterialEntity.setPid(one.getMaterialId());
 				aLong = basicMaterialClient.addMaterial(basicMaterialEntity);
 			}else {
-				aLong = materialByProductCode.getId();
+				basicMaterialEntity = basicMaterialClient.getMaterialByProductCode(distributionStockListDTO.getCargoNumber());
+				aLong = basicMaterialEntity.getId();
 			}
 			if (Func.isNotEmpty(one)) {
 				//生成新的库存品信息
@@ -309,6 +322,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 				BeanUtils.copyProperties(one, distributionStockListEntity);
 				distributionStockListEntity.setIncomingBatch("CB_" + new Date().getTime());
 				distributionStockListEntity.setPid(one.getId());
+				distributionStockListEntity.setCargoNumber(basicMaterialEntity.getProductCode());
 				distributionStockListEntity.setSku(distributionStockListDTO.getSku());
 				distributionStockListEntity.setQuantityStock((distributionStockListDTO.getStoreNum() * Integer.parseInt(distributionStockListDTO.getPackageNum())));
 				distributionStockListEntity.setUnpackingQuantity(0);
@@ -333,12 +347,6 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 				distributionStockListInfo.setSourceType("2");
 				distributionStockListInfo.setQuantityStock((distributionStockListDTO.getStoreNum() * Integer.parseInt(distributionStockListDTO.getPackageNum())));
 				distributionStockListInfoService.save(distributionStockListInfo);
-				//添加拆包记录
-				distributionUnpackingDetails.setStockArticleId(Optional.ofNullable(one.getStockArticleId()).orElse(null));
-				distributionUnpackingDetails.setOrderSelfNumber(Optional.ofNullable(one.getOrderCode()).orElse(null));
-				distributionUnpackingDetails.setItemName(Optional.ofNullable(one.getDescriptionGoods()).orElse(null));
-				distributionUnpackingDetails.setUnpackingQuantity(Optional.ofNullable(one.getUnpackingQuantity()).orElse(null));
-				distributionUnpackingDetails.setStockListId(Optional.ofNullable(distributionStockListDTO.getId()).orElse(null));
 			} else {
 				log.error("#################查询库存品失败");
 				return false;
@@ -350,6 +358,12 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 		//对原来的库存品进行数据维护
 		one.setQuantityStock(one.getQuantityStock() - distributionStockListDTO.getStoreNum());
 		this.updateById(one);
+		//添加拆包记录
+		distributionUnpackingDetails.setStockArticleId(Optional.ofNullable(one.getStockArticleId()).orElse(null));
+		distributionUnpackingDetails.setOrderSelfNumber(Optional.ofNullable(one.getOrderCode()).orElse(null));
+		distributionUnpackingDetails.setItemName(Optional.ofNullable(one.getDescriptionGoods()).orElse(null));
+		distributionUnpackingDetails.setUnpackingQuantity(Optional.ofNullable(one.getUnpackingQuantity()).orElse(null));
+		distributionUnpackingDetails.setStockListId(Optional.ofNullable(distributionStockListDTO.getId()).orElse(null));
 		return true;
 	}
 
@@ -723,7 +737,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 			throw new ServiceException("查询库存品信息失败");
 		}
 		for (DisStockListDetailEntity disStockListDetailEntity : stockUpStockListPack) {
-			Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(stockListEntity), Map.class);
+			Map<String, Object> map =                               JSONObject.parseObject(JSONObject.toJSONString(stockListEntity), Map.class);
 			map.put("id",disStockListDetailEntity.getId());
 			map.put("customerName",distributionReservationEntity.getConsignee());
 			map.put("customerTelephone",distributionReservationEntity.getDeliveryPhone());