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

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionStockListInfoEntity.java

@@ -293,4 +293,11 @@ public class DistributionStockListInfoEntity extends TenantEntity {
 	@ApiModelProperty(value = " 上架时间")
 	private Date groundingTime;
 
+	@ApiModelProperty(value = "物流公司")
+	private String logisticsCompany;
+
+	@ApiModelProperty(value = "备注")
+	private String remark;
+
+
 }

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

@@ -369,7 +369,10 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 					basicdataGoodsAllocationEntity.setWarehouseId(ck);
 					//String code = basicTenantCodeClient.shelfCode(AuthUtil.getTenantId(), "5");
 					//	String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName()+"-" + basicdataGoodsAllocationEntity.getColumnNum() + "-" + basicdataGoodsAllocationEntity.getLayerNum()  ;
-					String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName() + "排-" + basicdataGoodsAllocationEntity.getLayerNum() + "层-" + basicdataGoodsAllocationEntity.getColumnNum() + "列";
+//					String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName() + "排-" + basicdataGoodsAllocationEntity.getLayerNum() + "层-" + basicdataGoodsAllocationEntity.getColumnNum() + "列";
+
+					String allocationCode = basicdataGoodsShelfDTO.getGoodsAreaName()+basicdataGoodsShelfDTO.getGoodsShelfName() + basicdataGoodsAllocationEntity.getLayerNum() + "层" + basicdataGoodsAllocationEntity.getColumnNum() + "列";
+
 					basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 //				basicdataGoodsAllocationEntity.setAllocationStatuc("1");
 //				basicdataGoodsAllocationEntity.setEnableStatus("1");
@@ -853,7 +856,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl<BasicdataGoo
 			basicdataGoodsAllocationEntity.setGoodsAreaId(basicdataGoodsShelfDTO.getGoodsAreaId());
 			basicdataGoodsAllocationEntity.setGoodsShelfId(basicdataGoodsShelfDTO.getId());
 			basicdataGoodsAllocationEntity.setGoodsAllocationName(z + "-" + k);
-			String allocationCode = basicdataGoodsShelfDTO.getGoodsShelfName() + "排-" + basicdataGoodsAllocationEntity.getLayerNum() + "层-" + basicdataGoodsAllocationEntity.getColumnNum() + "列";
+			String allocationCode = basicdataGoodsShelfDTO.getGoodsAreaName()+basicdataGoodsShelfDTO.getGoodsShelfName() + basicdataGoodsAllocationEntity.getLayerNum() + "层" + basicdataGoodsAllocationEntity.getColumnNum() + "列";
 			basicdataGoodsAllocationEntity.setQrCode(allocationCode);
 			basicdataGoodsAllocationEntity.setWarehouseId(ck);
 			arrayList.add(basicdataGoodsAllocationEntity);

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

@@ -242,21 +242,32 @@
         where is_deleted = 0
     </select>
     <select id="pageList" resultType="com.logpm.distribution.vo.DistributionStockupVO">
-        select DISTINCT lds.id,lds.stockup_date stockupDate, lds.stockup_user stockupUser, lds.stockup_status
-        stockupStatus, lds.stockup_area stockupArea,
-        lds.assign_status assignStatus, lds.goods_area_id goodsAreaId, lds.forklift_name forkliftName,
-        lds.loader_name loaderName, lds.forklift_id forkliftId,lds.loader_id loaderId,lds.fix_time
-        fixTime,lds.assign_time assignTime,
-        lds.type_service typeService,lds.outbound_date outboundDate,lds.stockup_code stockupCode,
-        COALESCE(GROUP_CONCAT(DISTINCT ldpl.goods_allocation SEPARATOR ','), '') stockipAllocation,
-        COALESCE(GROUP_CONCAT(DISTINCT ldpl.pallet SEPARATOR ','), '') pallet,
+        SELECT DISTINCT
+        lds.id,
+        lds.stockup_date stockupDate,
+        lds.stockup_user stockupUser,
+        lds.stockup_status stockupStatus,
+        lds.stockup_area stockupArea,
+        lds.assign_status assignStatus,
+        lds.goods_area_id goodsAreaId,
+        lds.forklift_name forkliftName,
+        lds.loader_name loaderName,
+        lds.forklift_id forkliftId,
+        lds.loader_id loaderId,
+        lds.fix_time fixTime,
+        lds.assign_time assignTime,
+        lds.type_service typeService,
+        lds.outbound_date outboundDate,
+        lds.stockup_code stockupCode,
+        COALESCE ( group_concat( DISTINCT ldpl.goods_allocation SEPARATOR ',' ), '' ) AS stockipAllocation,
+        COALESCE ( group_concat( DISTINCT ldpl.pallet SEPARATOR ',' ), '' ) AS pallet,
         COALESCE ( group_concat( DISTINCT ldr.consignee SEPARATOR ',' ), '' ) AS consignee
-        from logpm_distribution_stockup lds
-        LEFT JOIN logpm_distribution_stockup_info ldsi on ldsi.stockup_id =lds.id
+        FROM
+        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
-        LEFT JOIN logpm_distribution_parcel_list ldpl on ldpl.id = ldrp.parce_list_id
-
+        LEFT JOIN logpm_distribution_reservation_package ldrp ON ldrp.reservation_id = ldsi.reservation_id
+        LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.id = ldrp.parce_list_id
         <where>
             lds.is_deleted = 0  AND ldsi.stock_status != 4
 

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

@@ -3224,6 +3224,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 								//这里需要先进行是否满足
 								parcelNumberVOS.forEach(p -> {
 									if (Func.isNotEmpty(p.getReservationNum()) && p.getReservationNum() > 0) {
+										if (p.getReservationNum() > p.getQuantity()){
+											throw new RuntimeException(s.getOrderCode()+p.getFirsts() + "可用数量不足!!!");
+										}
 										DistributionReservationZeroPackageEntity distributionReservationZeroPackageEntity = new DistributionReservationZeroPackageEntity();
 										distributionReservationZeroPackageEntity.setZeroPackageStatus(ReservationOrderStatusConstant.zhengchang.getValue());
 										distributionReservationZeroPackageEntity.setQuantity(p.getReservationNum());
@@ -3391,6 +3394,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										if (Func.isNotEmpty(oldZeroPackageList.get(pn.getParcelListId()))) {
 											//数量修改
 											if (Func.isNotEmpty(pn.getReservationNum()) && pn.getReservationNum() > 0) {
+												if (pn.getReservationNum() > pn.getQuantity()){
+													throw new RuntimeException(s.getOrderCode()+pn.getFirsts() + "可用数量不足!!!");
+												}
 												//修改该预约数量信息，维护零担订单品类数量信息
 												DistributionReservationZeroPackageEntity distributionReservationZeroPackageEntity = oldZeroPackageList.get(pn.getParcelListId()).get(0);
 												//维护零担品类

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

@@ -1193,7 +1193,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			if (Func.isNotEmpty(builder)){
 				String string = builder.deleteCharAt(builder.length() - 1).toString();
 				warehouseUpdownTypeClient.downPackageOrDelTray(string, myCurrentWarehouse.getId(), "签收下架解托");
-
 			}
 			if (!logList.isEmpty()) {
 				trunklinePackageTrackLogClient.addPackageTrackLog(logList);
@@ -3416,6 +3415,9 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 		});
 
 		if (n.get()) {
+
+
+
 			distributionBillLadingScanService.save(distributionBillLadingScan);
 			//进行下架解托
 			warehouseUpdownTypeClient.downPackageOrDelTray(distributionBillLadingScan.getPacketBarCode(),myCurrentWarehouse.getId(),"自提下架解托");

blade-service/logpm-factory/src/main/java/com/logpm/factory/jobhandler/OpFailPackageRetryJob.java

@@ -52,7 +52,7 @@ public class OpFailPackageRetryJob {
 		List<OpFailRetryPushPackageEntity> batchData = opFailRetryPushPackageMapper.selectWaitData(quantity, startId);
 
 		log.info("OpFailPackageRetryJob batchHandleData startId:{},quantity:{}",startId,quantity);
-//		opFailRetryPushPackageService.retry(batchData);
+		opFailRetryPushPackageService.retry(batchData);
 
 		log.info("OpFailPackageRetryJob batchHandleData end");
 		log.info("batchData.size {}",batchData.size());

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/mapper/OrderDetailMapper.xml

@@ -6,7 +6,7 @@
     <select id="findRukuTime" resultType="java.util.Date">
         select create_time
         from ht_scan_log
-        where unit_no = #{unitNo} and old_warehouse_id = #{oldWarehouseId}
+        where unit_no = #{unitNo} and warehouse_id = #{oldWarehouseId}
         and type in (1,4)
         order by create_time desc
         limit 1

blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/SyncWarehouseData.java

@@ -162,7 +162,7 @@ public class SyncWarehouseData {
 							entity.setAllocationStatus("1");
 							entity.setLayerNum(floor);
 							entity.setColumnNum(row);
-							entity.setQrCode(shelfEntity.getTitle()+"排"+floor+"层"+row+"列");
+							entity.setQrCode(goodsAreaEntity.getHeadline()+"区"+shelfEntity.getTitle()+"排"+floor+"层"+row+"列");
 							entity.setOldId(locationId);
 							Long newLocationId = basicdataGoodsAllocationClient.addLocation(entity);
 							if(Objects.isNull(newLocationId)){

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

@@ -1740,4 +1740,40 @@ public class OpenOrderController {
 	}
 
 
+	@ResponseBody
+	@PostMapping("/createOrderPackage")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "创建订单包件", notes = "传入openOrderDTO")
+	public R createOrderPackage(@RequestBody AdvanceDTO advanceDTO) {
+		String method = "############createOrderPackage: ";
+		log.info(method + "请求参数{}", advanceDTO);
+		Long advanceId = advanceDTO.getAdvanceId();
+
+
+		try{
+
+			BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+			if(Objects.isNull(myCurrentWarehouse)){
+				log.warn(method+"没有选择仓库 myCurrentWarehouse={}",myCurrentWarehouse);
+				return R.fail(405,"多仓权限无法操作，请选择仓库");
+			}
+			advanceDTO.setWarehouseId(myCurrentWarehouse.getId());
+
+
+			if(Objects.isNull(advanceId)){
+				log.warn(method+"暂存单id不能为空 advanceId={}",advanceId);
+				return R.fail(405,"暂存单id不能为空");
+			}
+
+			return openOrderService.createOrderPackage(advanceDTO);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error(method+"系统异常",e);
+			return R.fail(500,"系统异常");
+		}
+	}
+
+
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/IOpenOrderService.java

@@ -89,6 +89,8 @@ public interface IOpenOrderService {
 
 	R findWaybillDes(Long departureWarehouseId, Long consigneeId);
 
+	R createOrderPackage(AdvanceDTO advanceDTO);
+
 
 //	R findWaybillInfo(String waybillNo);
 }

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -3313,6 +3313,15 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		return R.data(map);
 	}
 
+	@Override
+	public R createOrderPackage(AdvanceDTO advanceDTO) {
+		Long advanceId = advanceDTO.getAdvanceId();
+		Long warehouseId = advanceDTO.getWarehouseId();
+
+
+		return null;
+	}
+
 	private List<EditOrderMsgVO> verifyData(OpenOrderDTO openOrderDTO, WarehouseWaybillEntity waybillEntity) {
 		log.info("###################verifyData: 验证改单数据");
 //		StringBuilder stringBuilder = new StringBuilder();

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

@@ -429,6 +429,8 @@ public class WarehouseWarehousingEntryServiceImpl extends BaseServiceImpl<Wareho
 			distributionStockListInfo.setQuantityStock(num);
 			distributionStockListInfo.setStorageLocation(warehousingDetail.getAllocationName() == null || Func.isEmpty(warehousingDetail.getAllocationName()) ? warehousingDetail.getTrayName() : warehousingDetail.getAllocationName());
 			distributionStockListInfo.setId(null);
+			distributionStockListInfo.setLogisticsCompany(warehousingEntryDTO.getLogisticsCompany());
+			distributionStockListInfo.setRemark(warehousingEntryDTO.getRemark());
 			return distributionStockListInfoClient.addStockListInfoEntity(distributionStockListInfo);
 		}
 	}