浏览代码

2024年11月27日17:04:43

纪新园 11 月之前
父节点
当前提交
3ec9606f21

+ 6 - 0
blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjOrder.java

@@ -520,6 +520,12 @@ public class PjOrder implements Serializable {
 	private String refno;
 
 	/**
+	 * 返利金额
+	 */
+	@ApiModelProperty(value = "返利金额")
+	private BigDecimal rebateAmount;
+
+	/**
 	 * 默认不显示已完成
 	 */
 	@TableField(exist = false)

+ 202 - 16
blade-service/blade-los/src/main/java/org/springblade/los/business/update/service/impl/UpdateServiceImpl.java

@@ -600,8 +600,39 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 					assignmentBCommodity(bills, null, null, null, null, null, bCommodity, item.getMainFieldCname(), "1", "3");
 					assignmentBCommodity(bills, null, null, null, null, null, bCommodity, item.getMainFieldEname(), "1", "4");
 				}
+			} else if ("业务来源".equals(item.getQueryType())) {
+				if ("OWN".equals(item.getFieldValueNew())) {
+					R<Dept> res = sysClient.getDept(Long.parseLong(item.getSecondLevel()));
+					if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+						dept = res.getData();
+						assignmentDept(bills, null, null, null, null, null, dept, item.getMainFieldId(), "1", "1");
+						assignmentDept(bills, null, null, null, null, null, dept, item.getMainFieldCode(), "1", "2");
+						assignmentDept(bills, null, null, null, null, null, dept, item.getMainFieldCname(), "1", "3");
+						assignmentDept(bills, null, null, null, null, null, dept, item.getMainFieldEname(), "1", "4");
+					}
+				} else if ("AGENT".equals(item.getFieldValueNew())) {
+					bCorps = bCorpsService.getById(Long.parseLong(item.getSecondLevel()));
+					if (bCorps != null) {
+						assignmentCorps(bills, null, null, null, null, null, bCorps, item.getMainFieldId(), "1", "1");
+						assignmentCorps(bills, null, null, null, null, null, bCorps, item.getMainFieldCode(), "1", "2");
+						assignmentCorps(bills, null, null, null, null, null, bCorps, item.getMainFieldCname(), "1", "3");
+						assignmentCorps(bills, null, null, null, null, null, bCorps, item.getMainFieldEname(), "1", "4");
+					}
+				} else if ("SALES".equals(item.getFieldValueNew())) {
+					R<User> res = userClient.userInfoById(Long.parseLong(item.getSecondLevel()));
+					if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+						user = res.getData();
+						assignmentUser(bills, null, null, null, null, null, user, item.getMainFieldId(), "1", "1");
+						assignmentUser(bills, null, null, null, null, null, user, item.getMainFieldCode(), "1", "2");
+						assignmentUser(bills, null, null, null, null, null, user, item.getMainFieldCname(), "1", "3");
+						assignmentUser(bills, null, null, null, null, null, user, item.getMainFieldEname(), "1", "4");
+					}
+				}
+				Field fieldId = bills.getClass().getDeclaredField(item.getField());
+				fieldId.setAccessible(true); // 使私有字段可访问
+				fieldId.set(bills, item.getFieldValueNew());
 			} else if ("字典".equals(item.getQueryType())) {
-				if ("srcType".equals(item.getField())) {
+				/*if ("srcType".equals(item.getField())) {
 					if ("OWN".equals(item.getFieldValueNew())) {
 						R<Dept> res = sysClient.getDept(Long.parseLong(item.getSecondLevel()));
 						if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
@@ -629,7 +660,7 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 							assignmentUser(bills, null, null, null, null, null, user, item.getMainFieldEname(), "1", "4");
 						}
 					}
-				}
+				}*/
 				Field fieldId = bills.getClass().getDeclaredField(item.getField());
 				fieldId.setAccessible(true); // 使私有字段可访问
 				fieldId.set(bills, item.getFieldValueNew());
@@ -778,8 +809,39 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 					assignmentBCommodity(null, aeaBills, null, null, null, null, bCommodity, item.getMainFieldCname(), "1", "3");
 					assignmentBCommodity(null, aeaBills, null, null, null, null, bCommodity, item.getMainFieldEname(), "1", "4");
 				}
+			} else if ("业务来源".equals(item.getQueryType())) {
+				if ("OWN".equals(item.getFieldValueNew())) {
+					R<Dept> res = sysClient.getDept(Long.parseLong(item.getSecondLevel()));
+					if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+						dept = res.getData();
+						assignmentDept(null, aeaBills, null, null, null, null, dept, item.getMainFieldId(), "1", "1");
+						assignmentDept(null, aeaBills, null, null, null, null, dept, item.getMainFieldCode(), "1", "2");
+						assignmentDept(null, aeaBills, null, null, null, null, dept, item.getMainFieldCname(), "1", "3");
+						assignmentDept(null, aeaBills, null, null, null, null, dept, item.getMainFieldEname(), "1", "4");
+					}
+				} else if ("AGENT".equals(item.getFieldValueNew())) {
+					bCorps = bCorpsService.getById(Long.parseLong(item.getSecondLevel()));
+					if (bCorps != null) {
+						assignmentCorps(null, aeaBills, null, null, null, null, bCorps, item.getMainFieldId(), "1", "1");
+						assignmentCorps(null, aeaBills, null, null, null, null, bCorps, item.getMainFieldCode(), "1", "2");
+						assignmentCorps(null, aeaBills, null, null, null, null, bCorps, item.getMainFieldCname(), "1", "3");
+						assignmentCorps(null, aeaBills, null, null, null, null, bCorps, item.getMainFieldEname(), "1", "4");
+					}
+				} else if ("SALES".equals(item.getFieldValueNew())) {
+					R<User> res = userClient.userInfoById(Long.parseLong(item.getSecondLevel()));
+					if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+						user = res.getData();
+						assignmentUser(null, aeaBills, null, null, null, null, user, item.getMainFieldId(), "1", "1");
+						assignmentUser(null, aeaBills, null, null, null, null, user, item.getMainFieldCode(), "1", "2");
+						assignmentUser(null, aeaBills, null, null, null, null, user, item.getMainFieldCname(), "1", "3");
+						assignmentUser(null, aeaBills, null, null, null, null, user, item.getMainFieldEname(), "1", "4");
+					}
+				}
+				Field fieldId = aeaBills.getClass().getDeclaredField(item.getField());
+				fieldId.setAccessible(true); // 使私有字段可访问
+				fieldId.set(aeaBills, item.getFieldValueNew());
 			} else if ("字典".equals(item.getQueryType())) {
-				if ("srcType".equals(item.getField())) {
+				/*if ("srcType".equals(item.getField())) {
 					if ("OWN".equals(item.getFieldValueNew())) {
 						R<Dept> res = sysClient.getDept(Long.parseLong(item.getSecondLevel()));
 						if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
@@ -807,7 +869,7 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 							assignmentUser(null, aeaBills, null, null, null, null, user, item.getMainFieldEname(), "1", "4");
 						}
 					}
-				}
+				}*/
 				Field fieldId = aeaBills.getClass().getDeclaredField(item.getField());
 				fieldId.setAccessible(true); // 使私有字段可访问
 				fieldId.set(aeaBills, item.getFieldValueNew());
@@ -956,8 +1018,39 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 					assignmentBCommodity(null, null, customsDeclaration, null, null, null, bCommodity, item.getMainFieldCname(), "1", "3");
 					assignmentBCommodity(null, null, customsDeclaration, null, null, null, bCommodity, item.getMainFieldEname(), "1", "4");
 				}
+			} else if ("业务来源".equals(item.getQueryType())) {
+				if ("OWN".equals(item.getFieldValueNew())) {
+					R<Dept> res = sysClient.getDept(Long.parseLong(item.getSecondLevel()));
+					if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+						dept = res.getData();
+						assignmentDept(null, null, customsDeclaration, null, null, null, dept, item.getMainFieldId(), "1", "1");
+						assignmentDept(null, null, customsDeclaration, null, null, null, dept, item.getMainFieldCode(), "1", "2");
+						assignmentDept(null, null, customsDeclaration, null, null, null, dept, item.getMainFieldCname(), "1", "3");
+						assignmentDept(null, null, customsDeclaration, null, null, null, dept, item.getMainFieldEname(), "1", "4");
+					}
+				} else if ("AGENT".equals(item.getFieldValueNew())) {
+					bCorps = bCorpsService.getById(Long.parseLong(item.getSecondLevel()));
+					if (bCorps != null) {
+						assignmentCorps(null, null, customsDeclaration, null, null, null, bCorps, item.getMainFieldId(), "1", "1");
+						assignmentCorps(null, null, customsDeclaration, null, null, null, bCorps, item.getMainFieldCode(), "1", "2");
+						assignmentCorps(null, null, customsDeclaration, null, null, null, bCorps, item.getMainFieldCname(), "1", "3");
+						assignmentCorps(null, null, customsDeclaration, null, null, null, bCorps, item.getMainFieldEname(), "1", "4");
+					}
+				} else if ("SALES".equals(item.getFieldValueNew())) {
+					R<User> res = userClient.userInfoById(Long.parseLong(item.getSecondLevel()));
+					if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+						user = res.getData();
+						assignmentUser(null, null, customsDeclaration, null, null, null, user, item.getMainFieldId(), "1", "1");
+						assignmentUser(null, null, customsDeclaration, null, null, null, user, item.getMainFieldCode(), "1", "2");
+						assignmentUser(null, null, customsDeclaration, null, null, null, user, item.getMainFieldCname(), "1", "3");
+						assignmentUser(null, null, customsDeclaration, null, null, null, user, item.getMainFieldEname(), "1", "4");
+					}
+				}
+				Field fieldId = customsDeclaration.getClass().getDeclaredField(item.getField());
+				fieldId.setAccessible(true); // 使私有字段可访问
+				fieldId.set(customsDeclaration, item.getFieldValueNew());
 			} else if ("字典".equals(item.getQueryType())) {
-				if ("srcType".equals(item.getField())) {
+				/*if ("srcType".equals(item.getField())) {
 					if ("OWN".equals(item.getFieldValueNew())) {
 						R<Dept> res = sysClient.getDept(Long.parseLong(item.getSecondLevel()));
 						if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
@@ -985,7 +1078,7 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 							assignmentUser(null, null, customsDeclaration, null, null, null, user, item.getMainFieldEname(), "1", "4");
 						}
 					}
-				}
+				}*/
 				Field fieldId = customsDeclaration.getClass().getDeclaredField(item.getField());
 				fieldId.setAccessible(true); // 使私有字段可访问
 				fieldId.set(customsDeclaration, item.getFieldValueNew());
@@ -1110,8 +1203,39 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 						assignmentBCommodity(null, null, null, amends, null, null, bCommodity, item.getAmendsFieldCname(), "4", "3");
 						assignmentBCommodity(null, null, null, amends, null, null, bCommodity, item.getAmendsFieldEname(), "4", "4");
 					}
+				} else if ("业务来源".equals(item.getQueryType())) {
+					if ("OWN".equals(item.getFieldValueNew())) {
+						R<Dept> res = sysClient.getDept(Long.parseLong(item.getSecondLevel()));
+						if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+							dept = res.getData();
+							assignmentDept(null, null, null, amends, null, null, dept, item.getAmendsFieldId(), "4", "1");
+							assignmentDept(null, null, null, amends, null, null, dept, item.getAmendsFieldCode(), "4", "2");
+							assignmentDept(null, null, null, amends, null, null, dept, item.getAmendsFieldCname(), "4", "3");
+							assignmentDept(null, null, null, amends, null, null, dept, item.getAmendsFieldEname(), "4", "4");
+						}
+					} else if ("AGENT".equals(item.getFieldValueNew())) {
+						bCorps = bCorpsService.getById(Long.parseLong(item.getSecondLevel()));
+						if (bCorps != null) {
+							assignmentCorps(null, null, null, amends, null, null, bCorps, item.getAmendsFieldId(), "4", "1");
+							assignmentCorps(null, null, null, amends, null, null, bCorps, item.getAmendsFieldCode(), "4", "2");
+							assignmentCorps(null, null, null, amends, null, null, bCorps, item.getAmendsFieldCname(), "4", "3");
+							assignmentCorps(null, null, null, amends, null, null, bCorps, item.getAmendsFieldEname(), "4", "4");
+						}
+					} else if ("SALES".equals(item.getFieldValueNew())) {
+						R<User> res = userClient.userInfoById(Long.parseLong(item.getSecondLevel()));
+						if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+							user = res.getData();
+							assignmentUser(null, null, null, amends, null, null, user, item.getAmendsFieldId(), "4", "1");
+							assignmentUser(null, null, null, amends, null, null, user, item.getAmendsFieldCode(), "4", "2");
+							assignmentUser(null, null, null, amends, null, null, user, item.getAmendsFieldCname(), "4", "3");
+							assignmentUser(null, null, null, amends, null, null, user, item.getAmendsFieldEname(), "4", "4");
+						}
+					}
+					Field fieldId = amends.getClass().getDeclaredField(item.getField());
+					fieldId.setAccessible(true); // 使私有字段可访问
+					fieldId.set(amends, item.getFieldValueNew());
 				} else if ("字典".equals(item.getQueryType())) {
-					if ("srcType".equals(item.getField())) {
+					/*if ("srcType".equals(item.getField())) {
 						if ("OWN".equals(item.getFieldValueNew())) {
 							R<Dept> res = sysClient.getDept(Long.parseLong(item.getSecondLevel()));
 							if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
@@ -1139,7 +1263,7 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 								assignmentUser(null, null, null, amends, null, null, user, item.getAmendsFieldEname(), "1", "4");
 							}
 						}
-					}
+					}*/
 					Field fieldId = amends.getClass().getDeclaredField(item.getField());
 					fieldId.setAccessible(true); // 使私有字段可访问
 					fieldId.set(amends, item.getFieldValueNew());
@@ -1251,8 +1375,39 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 						assignmentBCommodity(null, null, null, null, null, feeCenter, bCommodity, item.getFeeCenterFieldCname(), "6", "3");
 						assignmentBCommodity(null, null, null, null, null, feeCenter, bCommodity, item.getFeeCenterFieldEname(), "6", "4");
 					}
+				} else if ("业务来源".equals(item.getQueryType())) {
+					if ("OWN".equals(item.getFieldValueNew())) {
+						R<Dept> res = sysClient.getDept(Long.parseLong(item.getSecondLevel()));
+						if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+							dept = res.getData();
+							assignmentDept(null, null, null, null, null, feeCenter, dept, item.getFeeCenterFieldId(), "6", "1");
+							assignmentDept(null, null, null, null, null, feeCenter, dept, item.getFeeCenterFieldCode(), "6", "2");
+							assignmentDept(null, null, null, null, null, feeCenter, dept, item.getFeeCenterFieldCname(), "6", "3");
+							assignmentDept(null, null, null, null, null, feeCenter, dept, item.getFeeCenterFieldEname(), "6", "4");
+						}
+					} else if ("AGENT".equals(item.getFieldValueNew())) {
+						bCorps = bCorpsService.getById(Long.parseLong(item.getSecondLevel()));
+						if (bCorps != null) {
+							assignmentCorps(null, null, null, null, null, feeCenter, bCorps, item.getFeeCenterFieldId(), "6", "1");
+							assignmentCorps(null, null, null, null, null, feeCenter, bCorps, item.getFeeCenterFieldCode(), "6", "2");
+							assignmentCorps(null, null, null, null, null, feeCenter, bCorps, item.getFeeCenterFieldCname(), "6", "3");
+							assignmentCorps(null, null, null, null, null, feeCenter, bCorps, item.getFeeCenterFieldEname(), "6", "4");
+						}
+					} else if ("SALES".equals(item.getFieldValueNew())) {
+						R<User> res = userClient.userInfoById(Long.parseLong(item.getSecondLevel()));
+						if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+							user = res.getData();
+							assignmentUser(null, null, null, null, null, feeCenter, user, item.getFeeCenterFieldId(), "6", "1");
+							assignmentUser(null, null, null, null, null, feeCenter, user, item.getFeeCenterFieldCode(), "6", "2");
+							assignmentUser(null, null, null, null, null, feeCenter, user, item.getFeeCenterFieldCname(), "6", "3");
+							assignmentUser(null, null, null, null, null, feeCenter, user, item.getFeeCenterFieldEname(), "6", "4");
+						}
+					}
+					Field fieldId = feeCenter.getClass().getDeclaredField(item.getField());
+					fieldId.setAccessible(true); // 使私有字段可访问
+					fieldId.set(feeCenter, item.getFieldValueNew());
 				} else if ("字典".equals(item.getQueryType())) {
-					if ("srcType".equals(item.getField())) {
+					/*if ("srcType".equals(item.getField())) {
 						if ("OWN".equals(item.getFieldValueNew())) {
 							R<Dept> res = sysClient.getDept(Long.parseLong(item.getSecondLevel()));
 							if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
@@ -1280,7 +1435,7 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 								assignmentUser(null, null, null, null, null, feeCenter, user, item.getFeeCenterFieldEname(), "1", "4");
 							}
 						}
-					}
+					}*/
 					Field fieldId = feeCenter.getClass().getDeclaredField(item.getField());
 					fieldId.setAccessible(true); // 使私有字段可访问
 					fieldId.set(feeCenter, item.getFieldValueNew());
@@ -1393,14 +1548,39 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 						assignmentBCommodity(null, null, null, null, accBills, null, bCommodity, item.getFinAccBillsFieldCname(), "5", "3");
 						assignmentBCommodity(null, null, null, null, accBills, null, bCommodity, item.getFinAccBillsFieldEname(), "5", "4");
 					}
-				} else if ("字典".equals(item.getQueryType())) {
+				} else if ("业务来源".equals(item.getQueryType())) {
+					if ("OWN".equals(item.getFieldValueNew())) {
+						R<Dept> res = sysClient.getDept(Long.parseLong(item.getSecondLevel()));
+						if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+							dept = res.getData();
+							assignmentDept(null, null, null, null, accBills, null, dept, item.getFinAccBillsFieldId(), "5", "1");
+							assignmentDept(null, null, null, null, accBills, null, dept, item.getFinAccBillsFieldCode(), "5", "2");
+							assignmentDept(null, null, null, null, accBills, null, dept, item.getFinAccBillsFieldCname(), "5", "3");
+							assignmentDept(null, null, null, null, accBills, null, dept, item.getFinAccBillsFieldEname(), "5", "4");
+						}
+					} else if ("AGENT".equals(item.getFieldValueNew())) {
+						bCorps = bCorpsService.getById(Long.parseLong(item.getSecondLevel()));
+						if (bCorps != null) {
+							assignmentCorps(null, null, null, null, accBills, null, bCorps, item.getFinAccBillsFieldId(), "5", "1");
+							assignmentCorps(null, null, null, null, accBills, null, bCorps, item.getFinAccBillsFieldCode(), "5", "2");
+							assignmentCorps(null, null, null, null, accBills, null, bCorps, item.getFinAccBillsFieldCname(), "5", "3");
+							assignmentCorps(null, null, null, null, accBills, null, bCorps, item.getFinAccBillsFieldEname(), "5", "4");
+						}
+					} else if ("SALES".equals(item.getFieldValueNew())) {
+						R<User> res = userClient.userInfoById(Long.parseLong(item.getSecondLevel()));
+						if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
+							user = res.getData();
+							assignmentUser(null, null, null, null, accBills, null, user, item.getFinAccBillsFieldId(), "5", "1");
+							assignmentUser(null, null, null, null, accBills, null, user, item.getFinAccBillsFieldCode(), "5", "2");
+							assignmentUser(null, null, null, null, accBills, null, user, item.getFinAccBillsFieldCname(), "5", "3");
+							assignmentUser(null, null, null, null, accBills, null, user, item.getFinAccBillsFieldEname(), "5", "4");
+						}
+					}
 					Field fieldId = accBills.getClass().getDeclaredField(item.getField());
 					fieldId.setAccessible(true); // 使私有字段可访问
 					fieldId.set(accBills, item.getFieldValueNew());
-				}
-			} else {
-				if (ObjectUtils.isNotNull(item.getFinAccBillsFieldCname())) {
-					if ("srcType".equals(item.getField())) {
+				} else if ("字典".equals(item.getQueryType())) {
+					/*if ("srcType".equals(item.getField())) {
 						if ("OWN".equals(item.getFieldValueNew())) {
 							R<Dept> res = sysClient.getDept(Long.parseLong(item.getSecondLevel()));
 							if (res.isSuccess() && ObjectUtils.isNotNull(res.getData())) {
@@ -1428,7 +1608,13 @@ public class UpdateServiceImpl extends ServiceImpl<UpdateMapper, Update> impleme
 								assignmentUser(null, null, null, null, accBills, null, user, item.getFinAccBillsFieldEname(), "1", "4");
 							}
 						}
-					}
+					}*/
+					Field fieldId = accBills.getClass().getDeclaredField(item.getField());
+					fieldId.setAccessible(true); // 使私有字段可访问
+					fieldId.set(accBills, item.getFieldValueNew());
+				}
+			} else {
+				if (ObjectUtils.isNotNull(item.getFinAccBillsFieldCname())) {
 					Field fieldId = accBills.getClass().getDeclaredField(item.getFinAccBillsFieldCname());
 					fieldId.setAccessible(true); // 使私有字段可访问
 					fieldId.set(accBills, item.getFieldValueNew());

+ 19 - 0
blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -2297,6 +2297,25 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 	@Transactional(rollbackFor = Exception.class)
 	public R warehousingComplete(PjShip ship) {
 
+		if (ObjectUtils.isNotNull(ship.getStorageId())){
+			String status = sysClient.getParamService("whether.financing");
+			PjStorageDesc storageDesc = storageDescMapper.selectById(ship.getStorageId());
+			if (ObjectUtils.isNotNull(status) && "1".equals(status)){
+				if (ship.getBizTypeName().equals(OrderTypeEnum.TKSHGD.getType())){
+					if (storageDesc != null && "1".equals(storageDesc.getWhetherFinancing())) {
+						throw new RuntimeException("请选择自有库");
+					}
+				}else{
+					if ("1".equals(ship.getWhetherFinancing())){
+						throw new RuntimeException("请选择融资库");
+					}else{
+						throw new RuntimeException("请选择自有库");
+					}
+				}
+			}else{
+				throw new RuntimeException("请选择自有库");
+			}
+		}
 		if (ship.getId() == null) {
 			// 获取系统编号
 			String billNo = serialService.getBillNo(OrderTypeEnum.SHGD.getType(), OrderTypeEnum.SHGD.getType(), OrderTypeEnum.SHGD.getType());