Merge branch 'master' into 外协收回按炉结算判断

src/main/java/cn/ezhizao/project/business/controller/BizBeforeCheckoutVerifyController.java

@@ -230,6 +230,8 @@ public class BizBeforeCheckoutVerifyController extends BaseController {
             balanceAccount.setTechnologicalProcessDetailId(bizTechnologicalProcessDetail.getId());
             balanceAccount.setProcessId(v.getProcessId());
             balanceAccount.setProcessStepNumber(v.getProcessStepNumber());
+            balanceAccount.setProcessAlias(v.getProcessAlias());
+            balanceAccount.setProcessCode(v.getProcessCode());
             balanceAccount.setOutsourceOrderDetailProcessId(v.getId());
             // 产品数量
             balanceAccount.setProductNum(lot.getProductionQuantity());
@@ -268,12 +270,12 @@ public class BizBeforeCheckoutVerifyController extends BaseController {
 
             // 表面表示是否有表面处理
             balanceAccount.setSurfaceTreatment(l.getSupplier().getSurfaceTreatment());
-            balanceAccount.setCarrierNum(bizOutsourcedOrderDetail.getCarrierNum());
+            balanceAccount.setCarrierNum(bizOutsourcedOrderDetail.getNewCarrierCount());
             int sort = technologicalProcessDetails.indexOf(technologicalProcessDetails.stream().filter(t -> t.getProcessStepNumber().equals(v.getProcessStepNumber())).findFirst().orElse(new BizTechnologicalProcessDetail()));
             balanceAccount.setProcessSort(sort);
             balanceAccount.setReturnDate(receiptDetail.getFormDate());
             balanceAccount.setReturnNo(receiptDetail.getFormCode());
-            balanceAccount.setOutsourceNo(balanceAccount.getOutsourceNo());
+            balanceAccount.setOutsourceNo(bizOutsourcedOrder.getFormCode());
             balanceAccount.setFurnaceNum(1);
             balanceAccount.setCheckDate(bizProcessInspecion.getStartTime());
             balanceAccount.setMaterialLossRatio(bizSupplier.getLossLimit());