Merge branch 'dev' into pre-production

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClient.java

@@ -79,6 +79,11 @@ public interface IAdvanceClient {
 	 */
 	@GetMapping(API_PREFIX + "/queryDataOne")
 	AdvanceEntity getQueryDataOne(@RequestParam String orderSelfNum);
+
+	@GetMapping(API_PREFIX + "/getQueryDataList")
+	List<AdvanceEntity> getQueryDataList(@RequestParam String orderSelfNum);
+
+
 	@GetMapping(API_PREFIX + "/getEntityByMctsTruck")
 	List<AdvanceEntity> getEntityByMctsTruck(@RequestParam String orderSelfNum,@RequestParam String mctsTruck);
 

blade-service-api/logpm-old-project-api/src/main/java/com/logpm/oldproject/feign/IAdvanceClientFallbackFactory.java

@@ -6,6 +6,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.cloud.openfeign.FallbackFactory;
 import org.springframework.stereotype.Component;
 
+import java.util.Collections;
 import java.util.List;
 
 @Slf4j
@@ -36,6 +37,11 @@ public class IAdvanceClientFallbackFactory implements FallbackFactory<IAdvanceCl
 				return null;
 			}
 
+			@Override
+			public List<AdvanceEntity> getQueryDataList(String orderSelfNum) {
+				return Collections.emptyList();
+			}
+
 			@Override
 			public List<AdvanceEntity> getEntityByMctsTruck(String orderSelfNum, String mctsTruck) {
 				return null;

blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/SignOrderDetailVO.java

@@ -22,6 +22,7 @@ public class SignOrderDetailVO implements Serializable {
 	private Integer type;
 	private Integer num;
 	private Integer unloadNum;
+	private Integer signNum;
 	private String signUserName;
 	private Date signTime;
 	private Date unloadTime;

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

@@ -115,6 +115,9 @@
             <if test="po.appEnableStatus!=null and po.appEnableStatus!=''">
                 and goods_allocation.enable_status = 1
             </if>
+            <if test="po.enableStatus!=null and po.enableStatus!=''">
+                and goods_allocation.enable_status = #{po.enableStatus}
+            </if>
             <if test="po.goodsAreaId!=null and po.goodsAreaId!=''">
                 AND  goods_allocation.goods_area_id=#{po.goodsAreaId}
             </if>

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

@@ -457,7 +457,7 @@ public class BasicdataCodeServiceImpl implements IBasicdataCodeService {
 		basicdataCodeRecordEntity.setNum(inrc);
 		basicdataCodeRecordService.updateById(basicdataCodeRecordEntity);
 
-		String trayCode = "T" + code + year + CommonUtil.geFourNumber(month.longValue(), 2) + inrc;
+		String trayCode = code + year + CommonUtil.geFourNumber(month.longValue(), 2) + inrc;
 		String trayName = desName + abbreviation + inrc;
 
 		return trayCode+"&&"+trayName;

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

@@ -2944,20 +2944,53 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 	@Override
 	public void maintenanceCancelBillLading(List<Long> ids) {
+		List<Long> orderIds = new ArrayList<>();
+		List<Long> packageIds = new ArrayList<>();
 		for (Long id : ids) {
 			List<DistrilbutionBillPackageEntity> list = billPackageService.list(Wrappers.<DistrilbutionBillPackageEntity>query().lambda()
 				.eq(DistrilbutionBillPackageEntity::getBillLadingId, id)
-				.eq(DistrilbutionBillPackageEntity::getPacketBarStatus, ReservationPackageStatusConstant.quxiao.getValue())
 			);
 			if (!list.isEmpty()) {
-				List<Long> packageIds = list.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList());
-				distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update().lambda()
-					.in(DistributionParcelListEntity::getId, packageIds)
-					.set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue())
-				);
-				List<Long> orderIds = list.stream().map(DistrilbutionBillPackageEntity::getStockArticleId).distinct().collect(Collectors.toList());
-				distributionStockArticleService.maintenanceOrderInfoByIds(orderIds);
+				List<Long> packageIds1 = list.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList());
+				packageIds.addAll(packageIds1);
+
+				List<Long> orderId1 = list.stream().map(DistrilbutionBillPackageEntity::getStockArticleId).distinct().collect(Collectors.toList());
+				orderIds.addAll(orderId1);
 			}
+			List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntities = zeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda()
+				.eq(DistributionReservationZeroPackageEntity::getReservationId, id)
+				.eq(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
+				.eq(DistributionReservationZeroPackageEntity::getType, "3")
+			);
+
+			if (!reservationZeroPackageEntities.isEmpty()) {
+				//进行数据回退
+				List<Long> packageIds2 = reservationZeroPackageEntities.stream().map(DistributionReservationZeroPackageEntity::getParcelListId).distinct().collect(Collectors.toList());
+				packageIds.addAll(packageIds2);
+				for (DistributionReservationZeroPackageEntity reservationZeroPackageEntity : reservationZeroPackageEntities) {
+					reservationZeroPackageEntity.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue());
+					Integer quantity = reservationZeroPackageEntity.getQuantity();
+					distributionParcelNumberService.update(Wrappers.<DistributionParcelNumberEntity>update().lambda()
+						.eq(DistributionParcelNumberEntity::getParcelListId,reservationZeroPackageEntity.getParcelListId())
+						.eq(DistributionParcelNumberEntity::getStockArticleId,reservationZeroPackageEntity.getStockArticleId())
+						.setSql("delivery_quantity -", quantity)
+					);
+					zeroPackageService.updateById(reservationZeroPackageEntity);
+					//状态回退包件一定处于可预约
+					orderIds.add(reservationZeroPackageEntity.getStockArticleId());
+				}
+				if (!packageIds.isEmpty()) {
+					distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update().lambda()
+						.in(DistributionParcelListEntity::getId, packageIds)
+						.set(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue())
+					);
+				}
+				if (!orderIds.isEmpty()) {
+					List<Long> newOrderIds = orderIds.stream().distinct().collect(Collectors.toList());
+					distributionStockArticleService.maintenanceOrderInfoByIds(newOrderIds);
+				}
+			}
+
 		}
 	}
 

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/feign/AdvanceClient.java

@@ -26,6 +26,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -84,6 +85,11 @@ public class AdvanceClient implements IAdvanceClient {
 		}
 	}
 
+	@Override
+	public List<AdvanceEntity> getQueryDataList(String orderSelfNum) {
+		return service.getQueryDataList(orderSelfNum);
+	}
+
 	@Override
 	public List<AdvanceEntity> getEntityByMctsTruck(String orderSelfNum, String mctsTruck) {
 		return service.getEntityByMctsTruck(orderSelfNum,mctsTruck);

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

@@ -56,4 +56,6 @@ public interface AdvanceMapper  {
     List<AdvanceEntity> findListByAdvanceIds(@Param("advanceIds") List<Integer> advanceIds);
 
     List<String> findListByWaybillNo(@Param("waybillNo") String waybillNo);
+
+	List<AdvanceEntity> getQueryDataList(@Param("orderSelfNum") String orderSelfNum);
 }

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

@@ -25,6 +25,15 @@
         limit 1
     </select>
 
+    <select id="getQueryDataList" resultMap="advanceResultMap">
+        select * from ht_advance
+        <where>
+            delete_administrators_id = 0
+            and orderSelfNum = #{orderSelfNum}
+        </where>
+        order by waybill_no desc
+    </select>
+
     <insert id="addAll" useGeneratedKeys="true" keyProperty="id">
         INSERT INTO `ht_advance`( `orderSelfNum`, `siteName`, `area`, `orderTypeName`, `orderClassName`, `type`, `total`, `mtdsNo`,
                                  `firstPackName`, `firstPackCode`, `dealerCode`, `dealerName`, `dueDate`, `is_opai`, `orderNum`, `carrierName`,

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/IAdvanceService.java

@@ -56,4 +56,6 @@ public interface IAdvanceService  {
     List<AdvanceEntity> findListByAdvanceIds(List<Integer> advanceIds);
 
     List<String> findListByWaybillNo(String waybillNo);
+
+	List<AdvanceEntity> getQueryDataList(String orderSelfNum);
 }

blade-service/logpm-old-project/src/main/java/com/logpm/oldproject/service/impl/AdvanceServiceImpl.java

@@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -92,4 +93,9 @@ public class AdvanceServiceImpl implements IAdvanceService {
 	public List<String> findListByWaybillNo(String waybillNo) {
 		return advanceMapper.findListByWaybillNo(waybillNo);
 	}
+
+	@Override
+	public List<AdvanceEntity> getQueryDataList(String orderSelfNum) {
+		return advanceMapper.getQueryDataList(orderSelfNum);
+	}
 }

blade-service/logpm-patch/src/main/java/com/logpm/patch/service/impl/SyncOrderInfoServiceImpl.java

@@ -1433,12 +1433,27 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 
 	private void saveOrderInfo(String orderCode, Integer oldWarehouseId, Long newWarehouseId,Integer inventoryId) {
 
+		Integer total = 0;
 		//通过订单号查询暂存单
-		AdvanceEntity advanceEntity = advanceClient.getQueryDataOne(orderCode);
-		if(Objects.isNull(advanceEntity)){
-			log.warn("#################saveOrderInfo: 未查询单订单信息 orderCode={}",orderCode);
-			throw new CustomerException(403,"未查询单订单信息");
+		AdvanceEntity advanceEntity = null;
+		WayBillEntity wayBillEntity = null;
+		List<AdvanceEntity> advanceList = advanceClient.getAdvanceList(orderCode);
+		for (AdvanceEntity entity : advanceList) {
+			total = total + entity.getTotal();
+			String waybillNo = entity.getWaybillNo();
+			if(StringUtil.isNotBlank(waybillNo)){
+				WayBillEntity wb = wayBillClient.getByWaybillNo(waybillNo);
+				if(Objects.isNull(wb)){
+					Integer oWid = wb.getWarehouseId();
+					if(oldWarehouseId.equals(oWid)){
+						advanceEntity = advanceEntity;
+						wayBillEntity = wb;
+						break;
+					}
+				}
+			}
 		}
+
 		Integer advanceId = advanceEntity.getId();
 		//判断新系统是否有这条订单数据
 		DistributionStockArticleEntity distributionStockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(orderCode,newWarehouseId);
@@ -1449,13 +1464,6 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 			throw new CustomerException(403,"未查询单订单信息");
 		}
 
-		Integer total = 0;
-		List<AdvanceEntity> advanceList = advanceClient.getAdvanceList(orderCode);
-		for (AdvanceEntity entity : advanceList) {
-			total = total + entity.getTotal();
-		}
-
-		WayBillEntity wayBillEntity = wayBillClient.getByWayBillByOrderCode(orderCode);
 		if(Objects.isNull(wayBillEntity)){
 			log.warn("#################saveOrderInfo: 运单信息为空 orderCode={}",orderCode);
 			throw new CustomerException(403,"运单信息为空");

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

@@ -480,6 +480,7 @@
     <select id="findZeroListByWarehouseId" resultType="com.alibaba.fastjson.JSONObject">
         select ldsa.waybill_number waybillNo,
                ldsa.order_code orderCode,
+               ldsa.hand_quantity handQuantity,
                lww.create_time createTime,
                lww.destination destination,
                lww.destination_warehouse_name destinationWarehouseName,

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

@@ -92,6 +92,7 @@
                ltcls.type type,
                ltcls.num num,
                ltcls.unload_num unloadNum,
+               ltcls.unload_num signNum,
                ltcls.remark remak,
                ltcls.load_code carsNo,
                ltcls.sign_user_name signUserName,

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

@@ -1512,11 +1512,16 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			log.warn("###############updateCarsLoadBasicData: 配载计划不存在 loadId={}", loadId);
 			return R.fail(405, "配载计划不存在");
 		}
+		BigDecimal oldCountTransportCost = carsLoadEntity.getCountTransportCost();
 		TrunklineCarsLoadLineEntity currentLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
 		if (Objects.isNull(currentLoadLineEntity)) {
 			log.warn("###############updateCarsLoadBasicData: 配载计划节点不存在 loadId={} nodeId={}", loadId, warehouseId);
 			return R.fail(405, "配载计划节点不存在");
 		}
+		StringBuilder str = new StringBuilder();
+		if (oldCountTransportCost.compareTo(countTransportCost) != 0) {
+			str = new StringBuilder("运输费用: 由【" + oldCountTransportCost + "】改为" + countTransportCost + "。");
+		}
 
 		carsLoadEntity.setDriverId(driverId);
 		carsLoadEntity.setAssistantId(assistantId);
@@ -1559,6 +1564,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			trunklineCarsOrderService.deleteByLoadIdAndNodeIdAndWarehouseId(loadId, nodeId, warehouseId);
 			//删除节点信息
 			trunklineCarsLoadLineService.deleteEntityById(carsLoadLineId);
+
+			String nodeName = carsLoadLineEntity.getNodeName();
+			BigDecimal tollFee = carsLoadLineEntity.getTollFee();
+
+			str.append("&").append(nodeName).append(":").append("移除节点 费用减少").append(tollFee);
 		}
 
 		String loadLineTitleName = null;
@@ -1621,6 +1631,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					carsLoadLineEntity.setIsTermination("0");
 					trunklineCarsLoadLineService.save(carsLoadLineEntity);
 					carsLoadLineId = carsLoadLineEntity.getId();
+					str.append("&").append(nodeName).append(carsLoadLineEntity.getNodeName()).append(":").append("新增节点 费用增加").append(carsLoadLineEntity.getTollFee());
 				}
 			}
 
@@ -1684,9 +1695,23 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		try {
 			TrunklineCarsLoadLineEntity carsLoadLineEntity = trunklineCarsLoadLineService.findEntityByLoadIdAndNodeId(loadId, warehouseId);
 			trunklineCarsLoadLogService.saveLog(carsLoadEntity, carsLoadLineEntity, CarsLoadLogTypeConstant.UPDATE_CARS_LOAD.getValue());
+
+			if (StringUtil.isNotBlank(str.toString())) {
+				TrunklineCarsLoadFinanceEntity carsLoadFinanceEntity = new TrunklineCarsLoadFinanceEntity();
+				carsLoadFinanceEntity.setLoadId(loadId);
+				carsLoadFinanceEntity.setWarehouseId(warehouseId);
+				carsLoadFinanceEntity.setWarehouseName(currentLoadLineEntity.getNodeName());
+				carsLoadFinanceEntity.setCreateUserName(AuthUtil.getNickName());
+				carsLoadFinanceEntity.setContent(str.toString());
+				carsLoadFinanceService.save(carsLoadFinanceEntity);
+			}
 		} catch (Exception e) {
 			log.warn("#############updateCarsLoadBasicData: 存入日志失败");
 		}
+
+
+
+
 		return R.success("更新成功");
 	}