1.bug修复

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

@@ -20,6 +20,7 @@
             delete_administrators_id = 0
             and orderSelfNum = #{orderSelfNum}
         </where>
+        order by id desc
         limit 1
     </select>
 

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

@@ -12,7 +12,7 @@
         and `i`.warehouse_id = #{oldWarehouseId}
         and `o`.is_update = 0
         <if test="param != null and param != ''">
-            AND t.orderSelfNum = #{param}
+            AND `o`.order_code = #{param}
         </if>
         ORDER BY
         `i`.`id` DESC
@@ -57,7 +57,7 @@
         and `i`.warehouse_id = 30
         and `o`.is_update = 0
         <if test="param != null and param != ''">
-            AND t.orderSelfNum = #{param}
+            AND `o`.order_code = #{param}
         </if>
         ORDER BY
         `i`.`id` DESC

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

@@ -17,6 +17,7 @@ public class OrderCountServiceImpl implements IOrderCountService {
 	public OrderCountEntity getEntityByOrderCode(String orderCode,Integer oldWarehouseId) {
 		QueryWrapper<OrderCountEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("orderSelfNum",orderCode)
+			.eq("delete_time",0)
 			.eq("warehouse_id",oldWarehouseId);
 		return orderCountMapper.selectOne(queryWrapper);
 	}

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

@@ -1389,6 +1389,18 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 			Integer signState = orderDetailEntity.getSignState();
 			waybillNo = orderDetailEntity.getWaybillNo();
 			Date rukuTime = orderDetailEntity.getCreateTime();
+			if(StringUtil.isBlank(waybillNo)){
+				Integer advanceId = orderDetailEntity.getAdvanceId();
+				AdvanceEntity advanceEntity = advanceClient.fingById(advanceId);
+				if (!Objects.isNull(advanceEntity)) {
+					waybillNo = advanceEntity.getWaybillNo();
+				}
+			}
+
+			log.info("##########waybillNo:   waybillNo={} ",waybillNo);
+			if(waybillNo.contains(",")){
+				waybillNo = waybillNo.replaceAll(",", "");
+			}
 
 			//存入运单信息
 			WayBillEntity waybillEntity = saveWaybillEntity(waybillNo);
@@ -1414,15 +1426,17 @@ public class SyncOrderInfoServiceImpl implements ISyncOrderInfoService {
 			if(2 == signState){
 				entity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
 			}else{
-				String warehouseName = waybillEntity.getWarehouseName();//目的仓
-				BasicdataWarehouseEntity endhouse = basicdataWarehouseClient.findByName(warehouseName);
-				Long endWarehouseId = endhouse.getId();
-				Long warehouseId = distributionStockArticleEntity.getWarehouseId();
-
-				if(endWarehouseId.equals(warehouseId)){
-					entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
-				}else{
-					entity.setOrderPackageStatus(OrderPackageStatusConstant.zhongzhuanruku.getValue());
+				entity.setOrderPackageStatus(OrderPackageStatusConstant.zhongzhuanruku.getValue());
+				if(!Objects.isNull(waybillEntity)){
+					String warehouseName = waybillEntity.getWarehouseName();//目的仓
+					BasicdataWarehouseEntity endhouse = basicdataWarehouseClient.findByName(warehouseName);
+					Long endWarehouseId = endhouse.getId();
+					Long warehouseId = distributionStockArticleEntity.getWarehouseId();
+					if(endWarehouseId.equals(warehouseId)){
+						entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
+					}else{
+						entity.setOrderPackageStatus(OrderPackageStatusConstant.zhongzhuanruku.getValue());
+					}
 				}
 			}
 			entity.setOrderPackageFreezeStatus(OrderPackageFreezeStatusConstant.weidongjie.getValue());