1.转单接口bug修改

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -3221,10 +3221,10 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		billsJk.setInvoiceDrStatusDescr(null);
 		billsJk.setInvoiceCrStatus(null);
 		billsJk.setInvoiceCrStatusDescr(null);
-		billsJk.setBillStatus(null);
+		billsJk.setBillStatus(0);
 		billsJk.setAccountStatus(null);
 		billsJk.setExtendedData(null);
-		billsJk.setStatus(null);
+		billsJk.setStatus(0);
 		billsJk.setCharData(null);
 		billsJk.setBillingStatus(null);
 		billsJk.setEdiStatus(null);
@@ -3233,6 +3233,7 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		billsJk.setSrcBusId(detail.getId());
 		billsJk.setBusinessType("SI");
 		billsJk.setSeaType("I");
+		billsJk.setCorpCnName(billsJk.getCorpEnName());
 		String deptId = billsJk.getPodCompanyId() + "";
 		String deptName = billsJk.getPodCompanyName();
 		String branchId = billsJk.getPodCompanyId() + "";
@@ -3282,7 +3283,15 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 		}
 		BusinessBillNo businessBillNo = new BusinessBillNo();
 		businessBillNo.setBusinessTypeId(businessType.getId());
-		businessBillNo.setCode("HYJK");
+		if ("dry".equals(billsJk.getCargoType())) {
+			businessBillNo.setCode("HYJK");
+		} else if ("danger".equals(billsJk.getCargoType())) {
+			businessBillNo.setCode("HYJK-WXP");
+		} else if ("reefer".equals(billsJk.getCargoType())) {
+			businessBillNo.setCode("HYJK-DG");
+		} else {
+			businessBillNo.setCode("HYJK");
+		}
 		businessBillNo.setBranchId(branchId);
 		R clientBillNo = businessBillNoService.getBillNoLos(businessBillNo);
 		if (!clientBillNo.isSuccess()) {
@@ -3365,10 +3374,10 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					item.setInvoiceDrStatusDescr(null);
 					item.setInvoiceCrStatus(null);
 					item.setInvoiceCrStatusDescr(null);
-					item.setBillStatus(null);
+					item.setBillStatus(0);
 					item.setAccountStatus(null);
 					item.setExtendedData(null);
-					item.setStatus(null);
+					item.setStatus(0);
 					item.setCharData(null);
 					item.setBillingStatus(null);
 					item.setEdiStatus(null);
@@ -3380,7 +3389,16 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 					item.setSeaType("I");
 					BusinessBillNo businessBillNo1 = new BusinessBillNo();
 					businessBillNo1.setBusinessTypeId(businessType.getId());
-					businessBillNo1.setCode("HYJK");
+					if ("dry".equals(item.getCargoType())) {
+						businessBillNo1.setCode("HYJK");
+					} else if ("danger".equals(item.getCargoType())) {
+						businessBillNo1.setCode("HYJK-WXP");
+					} else if ("reefer".equals(item.getCargoType())) {
+						businessBillNo1.setCode("HYJK-DG");
+					} else {
+						businessBillNo1.setCode("HYJK");
+					}
+					businessBillNo1.setBranchId(branchId);
 					R clientBillNo1 = businessBillNoService.getBillNoLos(businessBillNo1);
 					if (!clientBillNo1.isSuccess()) {
 						throw new RuntimeException("生成订单编号失败");
@@ -3641,9 +3659,84 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 				item.setBranchId(billsJk.getBranchId());
 				item.setCreateDept(billsJk.getCreateDept());
 				item.setCreateDeptName(billsJk.getCreateDeptName());
+				item.setUnsettledAmount(item.getAmount());
+				item.setBillDate(billsJk.getBillDate());
+				item.setAuditStatus("0");
+				item.setBillBranchId(billsJk.getBranchId());
+				item.setBillBranchName(billsJk.getBranchName());
+				item.setBranchId(billsJk.getBranchId());
+				item.setBranchName(billsJk.getBranchName());
+				item.setCorpCnName(item.getCorpEnName());
+
 				item.setUpdateUser(null);
 				item.setUpdateTime(null);
 				item.setUpdateUserName(null);
+				item.setStlPid(null);
+				item.setAccBillId(null);
+				item.setAccBillNo(null);
+				item.setAccDate(null);
+				item.setAccAmount(null);
+				item.setAccStatus(null);
+				item.setAccById(null);
+				item.setAccByName(null);
+				item.setCheckBillId(null);
+				item.setCheckBillNo(null);
+				item.setCheckDate(null);
+				item.setCheckAmount(null);
+				item.setCheckStatus(null);
+				item.setCheckById(null);
+				item.setCheckByName(null);
+				item.setStlBillId(null);
+				item.setStlBillNo(null);
+				item.setStlDate(null);
+				item.setStlOrgAmount(null);
+				item.setStlCurCode(null);
+				item.setStlExrate(null);
+				item.setStlExrateLoc(null);
+				item.setStlAmount(null);
+				item.setStlAmountLoc(null);
+				item.setStlStatus(null);
+				item.setStlById(null);
+				item.setStlByName(null);
+				item.setStlTtlAmount(null);
+				item.setInvoiceBillId(null);
+				item.setInvoiceBillNo(null);
+				item.setInvoiceNo(null);
+				item.setInvoiceDate(null);
+				item.setInvoiceStatus(null);
+				item.setInvoiceCurCode(null);
+				item.setInvoiceExrate(null);
+				item.setInvoiceAmount(null);
+				item.setInvoiceAmountLoc(null);
+				item.setUninvoicedAmount(null);
+				item.setInvoiceById(null);
+				item.setInvoiceByName(null);
+				item.setIsSignfor(null);
+				item.setSignforId(null);
+				item.setSignforName(null);
+				item.setSignforDate(null);
+				item.setApplyId(null);
+				item.setApplyName(null);
+				item.setApplyTime(null);
+				item.setApproverId(null);
+				item.setApproverName(null);
+				item.setApproveTime(null);
+				item.setAppliedAmount(null);
+				item.setAppliedInvoiceAmount(null);
+				item.setReconciliationAmount(null);
+				item.setAppliedAmountStl(null);
+				item.setAppliedInvoiceAmountStl(null);
+				item.setAmendSrcItemId(null);
+				item.setDays(null);
+				item.setStorageDate(null);
+				item.setOutboundDate(null);
+				item.setSrcItemId(null);
+				item.setTaxInvoiceNumber(null);
+				item.setTaxInvoiceDate(null);
+				item.setDeductionTime(null);
+				item.setContainerNumber(null);
+				item.setAutomaticGenerated(null);
+				item.setExrate(currencyUtils.obtainExrate(item.getDc(), curExrateList,item.getCurCode(), "1"));
 				// 金额
 				BigDecimal amount = item.getAmount();
 				//判断是否是本位币