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

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

@@ -41,7 +41,7 @@
                lww.consignee_address consigneeAddress,
                lww.remark remark,
                lww.total_count-lww.billlading_num totalPlanNum,
-               lww.total_count-lww.billlading_num+ltbw.real_num planNum,
+               lww.total_count-lww.billlading_num + ltbw.real_num planNum,
                ltbw.real_num realNum,
                ltbw.billlading_fee billladingFee,
                lww.collect_pay collectPay,

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

@@ -147,6 +147,8 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 					billladingWaybillEntity.setRealWeight(BigDecimal.ZERO);
 					billladingWaybillEntity.setRealVolume(BigDecimal.ZERO);
 					billladingWaybillEntity.setBillladingFee(BigDecimal.ZERO);
+					billladingWaybillEntity.setWarehouseId(warehouseId);
+					billladingWaybillEntity.setWarehouseName(warehouseName);
 					saveBillladingWaybillList.add(billladingWaybillEntity);
 				}
 			}
@@ -696,14 +698,20 @@ public class TrunklineBillladingServiceImpl extends BaseServiceImpl<TrunklineBil
 			return R.fail(405,"总提货数大于运单总数量");
 		}
 
-		TrunklineBillladingWaybillEntity entity = new TrunklineBillladingWaybillEntity();
+		TrunklineBillladingWaybillEntity entity = billladingWaybillService.findEntityByWaybillIdAndBillladingId(waybillId, billladingId);
+		if(!Objects.isNull(entity)){
+			log.warn("#############addWaybillToBillladingId: 运单已绑定到该提货单 totalCount={} finishNum={} enterNum={}",totalCount,finishNum,enterNum);
+			return R.fail(405,"总提货数大于运单总数量");
+		}
+
+		entity = new TrunklineBillladingWaybillEntity();
 		entity.setWarehouseId(warehouseId);
 		entity.setWarehouseName(warehouseName);
 		entity.setBillladingId(billladingId);
 		entity.setBilladingCode(trunklineBillladingEntity.getBillladingCode());
 		entity.setWaybillId(waybillId);
 		entity.setWaybillNo(waybillNo);
-		entity.setRealNum(warehouseWaybillEntity.getTotalCount()-warehouseWaybillEntity.getBillladingNum());
+		entity.setRealNum(enterNum);
 		entity.setRealWeight(BigDecimal.ZERO);
 		entity.setRealVolume(BigDecimal.ZERO);
 		entity.setBillladingFee(BigDecimal.ZERO);