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

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

@@ -35,6 +35,7 @@
         from logpm_trunkline_waybill_track ltwt
         left join logpm_warehouse_waybill lww on lww.id = ltwt.waybill_id
         where 1=1
+        and ltwt.track_type = '888'
         <if test="param.warehouseIds != null and param.warehouseIds.size() > 0">
             and ltwt.warehouse_id in
             <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">

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

@@ -1017,8 +1017,10 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		List<String> batchPackageCodeByType = basicdataCodeClient.getBatchPackageCodeByType(warehouseCode, orderCode, totalNumber);
 		batchPackageCodeByType.forEach(item -> {
-			advanceDetailModel.setOrderPackageCode(item);
+			TrunklineAdvanceDetailEntity advanceDetailEntity = new TrunklineAdvanceDetailEntity();
-			detailEntities.add(advanceDetailModel);
+			BeanUtil.copy(advanceDetailModel,advanceDetailEntity);
+			advanceDetailEntity.setOrderPackageCode(item);
+			detailEntities.add(advanceDetailEntity);
 		});
 
 
@@ -1213,6 +1215,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 						advanceDetailModel.setPackageStatus("0");
 						if (!Objects.isNull(pacakgeDetailExcelDTO.getVolume())) {
 							advanceDetailModel.setVolume(new BigDecimal(pacakgeDetailExcelDTO.getVolume()));
+						}else{
+							advanceDetailModel.setVolume(BigDecimal.ZERO);
 						}
 
 						String materialName = pacakgeDetailExcelDTO.getMaterialName();
@@ -1660,7 +1664,12 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 						advanceDetailModel.setReturnNum(importStandardOuPaiDTO.getReturnNum());
 						advanceDetailModel.setSendDateStr(importStandardOuPaiDTO.getSendDateStr());
 						advanceDetailModel.setCarNumber(importStandardOuPaiDTO.getCarNumber());
-						advanceDetailModel.setVolume(new BigDecimal(importStandardOuPaiDTO.getVolume()));
+						String volume = importStandardOuPaiDTO.getVolume();
+						if(StringUtil.isBlank(volume)){
+							advanceDetailModel.setVolume(BigDecimal.ZERO);
+						}else{
+							advanceDetailModel.setVolume(new BigDecimal(importStandardOuPaiDTO.getVolume()));
+						}
 						advanceDetailModel.setTrainNumber(advanceEntity.getTrainNumber());
 						String firsts = importStandardOuPaiDTO.getFirstsName();
 						advanceDetailModel.setFirstPackName(firsts);
@@ -1791,7 +1800,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		Long warehouseId = openOrderDTO.getWarehouseId();
 		String warehouseName = openOrderDTO.getWarehouseName();
 		String editReson = openOrderDTO.getEditReson();
-		String remark = openOrderDTO.getRemark();
+		String refer = openOrderDTO.getRefer();
 		WarehouseWaybillEntity waybillEntity = warehouseWaybillClient.findByWaybillId(waybillId);
 		if (Objects.isNull(waybillEntity)) {
 			log.warn("#############updateWaybill: 运单信息不存在 waybillId={}", waybillId);
@@ -1810,7 +1819,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 //		String operationRemark = "修改运单"+waybillNo+",时间："+ CommonUtil.dateToString(waybillEntity.getCreateTime())+","+updateMsg;
 		//异步存入日志
-		openOrderAsyncService.saveUpdateLog(waybillId, waybillNo, "888", editReson, remark+" 修改内容："+updateMsg, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName,waybillEntity);
+		openOrderAsyncService.saveUpdateLog(waybillId, waybillNo, "888", editReson, "备注："+refer+" 修改内容："+updateMsg, AuthUtil.getNickName(), AuthUtil.getUserId(), warehouseId, warehouseName,waybillEntity);
 
 		return R.success("改单成功");
 	}
@@ -1938,7 +1947,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			String orderCode = advanceEntity.getOrderCode();
 			String trainNumber = advanceEntity.getTrainNumber();
 			ImportOrderNoPackageExcelDTO importOrderNoPackageExcelDTO = importOrderNoPackageExcelDTOMap.get(orderCode + "&" + (StringUtil.isBlank(trainNumber) ? "null" : trainNumber));
-			if(Objects.isNull(importOrderNoPackageExcelDTO)){
+			if(!Objects.isNull(importOrderNoPackageExcelDTO)){
 				String firsts = importOrderNoPackageExcelDTO.getFirsts();
 				Integer totalNum = advanceEntity.getTotalNum();
 				TrunklineAdvanceDetailEntity advanceDetailModel = new TrunklineAdvanceDetailEntity();
@@ -1966,14 +1975,27 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 				advanceDetailModel.setServiceNum(advanceEntity.getServiceNum());
 				advanceDetailModel.setMaterialCode(importOrderNoPackageExcelDTO.getMaterialCode());
 				advanceDetailModel.setMaterialName(importOrderNoPackageExcelDTO.getMaterialName());
-				advanceDetailModel.setVolume(new BigDecimal(importOrderNoPackageExcelDTO.getVolume()));
+				String volume = importOrderNoPackageExcelDTO.getVolume();
+				if (StringUtil.isBlank(volume)){
+					advanceDetailModel.setVolume(BigDecimal.ZERO);
+				}else{
+					advanceDetailModel.setVolume(new BigDecimal(volume));
+				}
+				String weight = importOrderNoPackageExcelDTO.getWeight();
+				if (StringUtil.isBlank(weight)){
+					advanceDetailModel.setWeight(BigDecimal.ZERO);
+				}else{
+					advanceDetailModel.setWeight(new BigDecimal(weight));
+				}
 				advanceDetailModel.setWeight(new BigDecimal(importOrderNoPackageExcelDTO.getWeight()));
 				advanceDetailModel.setPackageStatus("0");
 
 				List<String> orderPackageCodes = basicdataCodeClient.getBatchPackageCodeByType(warehouseCode, orderCode, totalNum);
 				orderPackageCodes.forEach(orderPackageCode -> {
-					advanceDetailModel.setOrderPackageCode(orderPackageCode);
+					TrunklineAdvanceDetailEntity advanceDetailEntity = new TrunklineAdvanceDetailEntity();
-					advanceDetailEntities.add(advanceDetailModel);
+					BeanUtil.copy(advanceDetailModel, advanceDetailEntity);
+					advanceDetailEntity.setOrderPackageCode(orderPackageCode);
+					advanceDetailEntities.add(advanceDetailEntity);
 				});
 			}
 		}