1127

src/main/java/cn/ezhizao/project/business/outsourceBalanceAccount/controller/BizOutsourceBalanceAccountController.java

@@ -0,0 +1,110 @@
+package cn.ezhizao.project.business.outsourceBalanceAccount.controller;
+
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+
+import cn.ezhizao.common.utils.poi.ExcelUtil;
+import cn.ezhizao.framework.aspectj.lang.annotation.Log;
+import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
+import cn.ezhizao.framework.web.controller.BaseController;
+import cn.ezhizao.framework.web.domain.AjaxResult;
+import cn.ezhizao.framework.web.page.TableDataInfo;
+import cn.ezhizao.project.business.outsourceBalanceAccount.domain.BizOutsourceBalanceAccount;
+import cn.ezhizao.project.business.outsourceBalanceAccount.service.IBizOutsourceBalanceAccountService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 外协结算Controller
+ *
+ * @author ezhizao
+ * @date 2024-11-25
+ */
+@RestController
+@RequestMapping("/business/account")
+public class BizOutsourceBalanceAccountController extends BaseController
+{
+    @Resource
+    private IBizOutsourceBalanceAccountService bizOutsourceBalanceAccountService;
+
+    /**
+     * 查询外协结算列表
+     */
+    @PreAuthorize("@ss.hasPermi('business:account:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(BizOutsourceBalanceAccount bizOutsourceBalanceAccount) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourceBalanceAccount);
+        startPage();
+        List<BizOutsourceBalanceAccount> list = bizOutsourceBalanceAccountService.getList(bizOutsourceBalanceAccount);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出外协结算列表
+     */
+    @PreAuthorize("@ss.hasPermi('business:account:export')")
+    @Log(title = "外协结算", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, BizOutsourceBalanceAccount bizOutsourceBalanceAccount) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourceBalanceAccount);
+        List<BizOutsourceBalanceAccount> list = bizOutsourceBalanceAccountService.getList(bizOutsourceBalanceAccount);
+        ExcelUtil<BizOutsourceBalanceAccount> util = new ExcelUtil<BizOutsourceBalanceAccount>(BizOutsourceBalanceAccount.class);
+        util.exportExcel(response, list, "外协结算数据");
+    }
+
+    /**
+     * 获取外协结算详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('business:account:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(bizOutsourceBalanceAccountService.getById(id));
+    }
+
+    /**
+     * 新增外协结算
+     */
+    @PreAuthorize("@ss.hasPermi('business:account:add')")
+    @Log(title = "外协结算", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody BizOutsourceBalanceAccount bizOutsourceBalanceAccount) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourceBalanceAccount);
+        return toAjax(bizOutsourceBalanceAccountService.save(bizOutsourceBalanceAccount));
+    }
+
+    /**
+     * 修改外协结算
+     */
+    @PreAuthorize("@ss.hasPermi('business:account:edit')")
+    @Log(title = "外协结算", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody BizOutsourceBalanceAccount bizOutsourceBalanceAccount) throws NoSuchFieldException, IllegalAccessException
+    {
+        setTenantId(bizOutsourceBalanceAccount);
+        return toAjax(bizOutsourceBalanceAccountService.updateById(bizOutsourceBalanceAccount));
+    }
+
+    /**
+     * 删除外协结算
+     */
+    @PreAuthorize("@ss.hasPermi('business:account:remove')")
+    @Log(title = "外协结算", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable List<Long> ids)
+    {
+        return toAjax(bizOutsourceBalanceAccountService.removeBatchByIds(ids));
+    }
+}

src/main/java/cn/ezhizao/project/business/outsourceBalanceAccount/domain/BizOutsourceBalanceAccount.java

@@ -0,0 +1,365 @@
+package cn.ezhizao.project.business.outsourceBalanceAccount.domain;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+import cn.ezhizao.framework.aspectj.lang.annotation.Excel;
+import cn.ezhizao.framework.web.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 外协结算对象 biz_outsource_balance_account
+ *
+ * @author ezhizao
+ * @date 2024-11-25
+ */
+@Data
+@TableName(value = "biz_outsource_balance_account")
+public class BizOutsourceBalanceAccount extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 租户（厂别）id */
+    @ApiModelProperty(value = "${comment}")
+    private Long tenantId;
+
+    /** 外协商id */
+    @ApiModelProperty(value = "${comment}")
+    private Long supplierId;
+
+    /** 外协商名称 */
+    @Excel(name = "外协商名称")
+    @ApiModelProperty(value = "外协商名称")
+    private String supplierName;
+
+    /** 外协商code */
+    @Excel(name = "外协商code")
+    @ApiModelProperty(value = "外协商code")
+    private String supplierCode;
+
+    /** 外协单外键 */
+    @ApiModelProperty(value = "外协商code")
+    private Long outsourceOrderId;
+
+    /** 外协单明细外键 */
+    @ApiModelProperty(value = "外协商code")
+    private Long outsourceOrderDetailId;
+
+    /** 外协明细工序外键 */
+    @ApiModelProperty(value = "外协商code")
+    private Long outsourceOrderDetailProcessId;
+
+    /** 外协质检外键 */
+    @ApiModelProperty(value = "外协商code")
+    private Long processInspectionId;
+
+    /** 外协收回明细外键 */
+    @ApiModelProperty(value = "外协商code")
+    private Long returnReceiptDetailId;
+
+    /** 外协收回单外键 */
+    @ApiModelProperty(value = "外协商code")
+    private Long returnReceiptId;
+
+    /** 报工外键 */
+    @ApiModelProperty(value = "外协商code")
+    private Long dayworkId;
+
+    /** 报工明细外键 */
+    @ApiModelProperty(value = "外协商code")
+    private Long dayworkItemId;
+
+    /** 0：无结算方式；1：按支结算；2：按炉结算 */
+    @Excel(name = "0：无结算方式；1：按支结算；2：按炉结算")
+    @ApiModelProperty(value = "0：无结算方式；1：按支结算；2：按炉结算")
+    private String settlementType;
+
+    /** 批次id */
+    @ApiModelProperty(value = "0：无结算方式；1：按支结算；2：按炉结算")
+    private Long lotId;
+
+    /** 批次号 */
+    @Excel(name = "批次号")
+    @ApiModelProperty(value = "批次号")
+    private String lotCode;
+
+    /** 产品id */
+    @ApiModelProperty(value = "批次号")
+    private Long productId;
+
+    /** 产品编码 */
+    @Excel(name = "产品编码")
+    @ApiModelProperty(value = "产品编码")
+    private String productCode;
+
+    /** 产品描述 */
+    @Excel(name = "产品描述")
+    @ApiModelProperty(value = "产品描述")
+    private String productDescription;
+
+    /** 工艺id（通过工艺id，获取版本号） */
+    @ApiModelProperty(value = "产品描述")
+    private Long technologicalProcessId;
+
+    /** 工艺版本A,B,C */
+    @Excel(name = "工艺版本A,B,C")
+    @ApiModelProperty(value = "工艺版本A,B,C")
+    private String technologyVersion;
+
+    /** 工艺版本明细id */
+    @ApiModelProperty(value = "工艺版本A,B,C")
+    private Long technologicalProcessDetailId;
+
+    /** 工序id */
+    @ApiModelProperty(value = "工艺版本A,B,C")
+    private Long processId;
+
+    /** 工序简称 */
+    @Excel(name = "工序简称")
+    @ApiModelProperty(value = "工序简称")
+    private String processAlias;
+
+    /** 工序编码 */
+    @Excel(name = "工序编码")
+    @ApiModelProperty(value = "工序编码")
+    private String processCode;
+
+    /** =seq1(2位)+seq2(1位)+0(第4位用于单批单改) */
+    @Excel(name = "=seq1(2位)+seq2(1位)+0(第4位用于单批单改)")
+    @ApiModelProperty(value = "=seq1(2位)+seq2(1位)+0(第4位用于单批单改)")
+    private String processStepNumber;
+
+    /** 产品数 */
+    @Excel(name = "产品数")
+    @ApiModelProperty(value = "产品数")
+    private Long productNum;
+
+    /** 投产数 */
+    @Excel(name = "投产数")
+    @ApiModelProperty(value = "投产数")
+    private Long productionNum;
+
+    /** 发出数 */
+    @Excel(name = "发出数")
+    @ApiModelProperty(value = "发出数")
+    private Long outputNum;
+
+    /** 合格数 */
+    @Excel(name = "合格数")
+    @ApiModelProperty(value = "合格数")
+    private Long receiptNum;
+
+    /** 工序单价 */
+    @Excel(name = "工序单价")
+    @ApiModelProperty(value = "工序单价")
+    private BigDecimal processPrice;
+
+    /** 补差额 */
+    @Excel(name = "补差额")
+    @ApiModelProperty(value = "补差额")
+    private BigDecimal fillDifferencePrice;
+
+    /** 其他扣款 */
+    @Excel(name = "其他扣款")
+    @ApiModelProperty(value = "其他扣款")
+    private BigDecimal otherCost;
+
+    /** 实投料量 */
+    @Excel(name = "实投料量")
+    @ApiModelProperty(value = "实投料量")
+    private BigDecimal actualInventory;
+
+    /** 料损数量 */
+    @Excel(name = "料损数量")
+    @ApiModelProperty(value = "料损数量")
+    private Long materialLoss;
+
+    /** 扣料金额 */
+    @Excel(name = "扣料金额")
+    @ApiModelProperty(value = "扣料金额")
+    private BigDecimal materialLossAmount;
+
+    /** 应得金额 */
+    @Excel(name = "应得金额")
+    @ApiModelProperty(value = "应得金额")
+    private BigDecimal planAmount;
+
+    /** 实得金额 */
+    @Excel(name = "实得金额")
+    @ApiModelProperty(value = "实得金额")
+    private BigDecimal acutalAmount;
+
+    /** 含税金额 */
+    @Excel(name = "含税金额")
+    @ApiModelProperty(value = "含税金额")
+    private BigDecimal taxAmount;
+
+    /** 运费 */
+    @Excel(name = "运费")
+    @ApiModelProperty(value = "运费")
+    private BigDecimal freightAmount;
+
+    /** 材料单价 */
+    @Excel(name = "材料单价")
+    @ApiModelProperty(value = "材料单价")
+    private BigDecimal materialPrice;
+
+    /** 销售单价 */
+    @Excel(name = "销售单价")
+    @ApiModelProperty(value = "销售单价")
+    private BigDecimal salePrice;
+
+    /** 废品单价 */
+    @Excel(name = "废品单价")
+    @ApiModelProperty(value = "废品单价")
+    private BigDecimal wastePrice;
+
+    /** 箱数 */
+    @Excel(name = "箱数")
+    @ApiModelProperty(value = "箱数")
+    private Long carrierNum;
+
+    /** 工序序号 */
+    @Excel(name = "工序序号")
+    @ApiModelProperty(value = "工序序号")
+    private Long processSort;
+
+    /** 结算日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "结算日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "结算日期")
+    private Date checkoutDate;
+
+    /** 审核日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "审核日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "审核日期")
+    private Date auditDate;
+
+    /** 收回日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "收回日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "收回日期")
+    private Date returnDate;
+
+    /** 收回单号 */
+    @Excel(name = "收回单号")
+    @ApiModelProperty(value = "收回单号")
+    private String returnNo;
+
+    /** 发出单号 */
+    @Excel(name = "发出单号")
+    @ApiModelProperty(value = "发出单号")
+    private String outsourceNo;
+
+    /** 炉数 */
+    @Excel(name = "炉数")
+    @ApiModelProperty(value = "炉数")
+    private Long furnaceNum;
+
+    /** 检查日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "检查日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "检查日期")
+    private Date checkDate;
+
+    /** 质检单号 */
+    @Excel(name = "质检单号")
+    @ApiModelProperty(value = "质检单号")
+    private String inspectionNo;
+
+    /** 料损率 */
+    @Excel(name = "料损率")
+    @ApiModelProperty(value = "料损率")
+    private BigDecimal materialLossRatio;
+
+    /** 是否有表面处理 */
+    @Excel(name = "是否有表面处理")
+    @ApiModelProperty(value = "是否有表面处理")
+    private String surfaceTreatment;
+
+    /** 长度 */
+    @Excel(name = "长度")
+    @ApiModelProperty(value = "长度")
+    private BigDecimal length;
+
+    /** 材料直径 */
+    @Excel(name = "材料直径")
+    @ApiModelProperty(value = "材料直径")
+    private BigDecimal materialDiameter;
+
+    /** 公差 */
+    @Excel(name = "公差")
+    @ApiModelProperty(value = "公差")
+    private BigDecimal tolerance;
+
+    /** 利用率 */
+    @Excel(name = "利用率")
+    @ApiModelProperty(value = "利用率")
+    private BigDecimal utilizationRatio;
+
+    /** 币种 */
+    @Excel(name = "币种")
+    @ApiModelProperty(value = "币种")
+    private String currency;
+
+    /** 税率 */
+    @Excel(name = "税率")
+    @ApiModelProperty(value = "税率")
+    private BigDecimal taxRate;
+
+    /** 年 */
+    @Excel(name = "年")
+    @ApiModelProperty(value = "年")
+    private String year;
+
+    /** 月 */
+    @Excel(name = "月")
+    @ApiModelProperty(value = "月")
+    private String month;
+
+    /** 废品价类别 */
+    @Excel(name = "废品价类别")
+    @ApiModelProperty(value = "废品价类别")
+    private String wastePriceCategory;
+
+    /** 材料编码 */
+    @Excel(name = "材料编码")
+    @ApiModelProperty(value = "材料编码")
+    private String rawMaterialCode;
+
+    /** 密度 */
+    @Excel(name = "密度")
+    @ApiModelProperty(value = "密度")
+    private BigDecimal density;
+
+    /** 形状 */
+    @Excel(name = "形状")
+    @ApiModelProperty(value = "形状")
+    private String shape;
+
+    /** 类别 */
+    @Excel(name = "类别")
+    @ApiModelProperty(value = "类别")
+    private String type;
+
+    /** 状态 */
+    @Excel(name = "状态")
+    @ApiModelProperty(value = "状态")
+    private Integer status;
+
+    /** 是否是废品回用(0:否；1：是) */
+    @Excel(name = "是否是废品回用(0:否；1：是)")
+    @ApiModelProperty(value = "是否是废品回用(0:否；1：是)")
+    private Integer isWasteRecycling;
+
+    /** 是否修改(0 否 ，1 是)单批单改；多批单改；回退 */
+    @Excel(name = "是否修改(0 否 ，1 是)单批单改；多批单改；回退")
+    @ApiModelProperty(value = "是否修改(0 否 ，1 是)单批单改；多批单改；回退")
+    private Integer isAmend;
+
+}

src/main/java/cn/ezhizao/project/business/outsourceBalanceAccount/mapper/BizOutsourceBalanceAccountMapper.java

@@ -0,0 +1,31 @@
+package cn.ezhizao.project.business.outsourceBalanceAccount.mapper;
+
+import java.util.List;
+
+import cn.ezhizao.project.business.outsourceBalanceAccount.domain.BizOutsourceBalanceAccount;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+
+/**
+ * 外协结算Mapper接口
+ *
+ * @author ezhizao
+ * @date 2024-11-25
+ */
+public interface BizOutsourceBalanceAccountMapper extends BaseMapper<BizOutsourceBalanceAccount>
+{
+    /**
+     * 查询外协结算列表
+     *
+     * @param bizOutsourceBalanceAccount 外协结算
+     * @return 外协结算集合
+     */
+    public List<BizOutsourceBalanceAccount> getList(BizOutsourceBalanceAccount bizOutsourceBalanceAccount);
+
+    /**
+     * 物理删除
+     * @param bizOutsourceBalanceAccount
+     * @return 删除结果
+    */
+    public int physicalDelete(BizOutsourceBalanceAccount bizOutsourceBalanceAccount);
+}

src/main/java/cn/ezhizao/project/business/outsourceBalanceAccount/service/IBizOutsourceBalanceAccountService.java

@@ -0,0 +1,32 @@
+package cn.ezhizao.project.business.outsourceBalanceAccount.service;
+
+import java.util.List;
+
+import cn.ezhizao.project.business.outsourceBalanceAccount.domain.BizOutsourceBalanceAccount;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+
+/**
+ * 外协结算Service接口
+ *
+ * @author ezhizao
+ * @date 2024-11-25
+ */
+public interface IBizOutsourceBalanceAccountService extends IService<BizOutsourceBalanceAccount>
+{
+    /**
+     * 查询外协结算列表
+     *
+     * @param bizOutsourceBalanceAccount 外协结算
+     * @return 外协结算集合
+     */
+    public List<BizOutsourceBalanceAccount> getList(BizOutsourceBalanceAccount bizOutsourceBalanceAccount);
+
+    /**
+     * 物理删除
+     * @param bizOutsourceBalanceAccount
+     * @return 删除结果
+     */
+    public int physicalDelete(BizOutsourceBalanceAccount bizOutsourceBalanceAccount);
+
+}

src/main/java/cn/ezhizao/project/business/outsourceBalanceAccount/service/impl/BizOutsourceBalanceAccountServiceImpl.java

@@ -0,0 +1,45 @@
+package cn.ezhizao.project.business.outsourceBalanceAccount.service.impl;
+
+import java.util.List;
+import javax.annotation.Resource;
+
+import cn.ezhizao.project.business.outsourceBalanceAccount.domain.BizOutsourceBalanceAccount;
+import cn.ezhizao.project.business.outsourceBalanceAccount.mapper.BizOutsourceBalanceAccountMapper;
+import cn.ezhizao.project.business.outsourceBalanceAccount.service.IBizOutsourceBalanceAccountService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 外协结算Service业务层处理
+ *
+ * @author ezhizao
+ * @date 2024-11-25
+ */
+@Service
+public class BizOutsourceBalanceAccountServiceImpl  extends ServiceImpl<BizOutsourceBalanceAccountMapper, BizOutsourceBalanceAccount> implements IBizOutsourceBalanceAccountService
+{
+    @Resource
+    private BizOutsourceBalanceAccountMapper bizOutsourceBalanceAccountMapper;
+
+    /**
+     * 查询外协结算列表
+     *
+     * @param bizOutsourceBalanceAccount 外协结算
+     * @return 外协结算
+     */
+    @Override
+    public List<BizOutsourceBalanceAccount> getList(BizOutsourceBalanceAccount bizOutsourceBalanceAccount)
+    {
+        return bizOutsourceBalanceAccountMapper.getList(bizOutsourceBalanceAccount);
+    }
+
+    /**
+     * 物理删除
+     * @param bizOutsourceBalanceAccount
+     * @return 删除结果
+     */
+    @Override
+    public int physicalDelete(BizOutsourceBalanceAccount bizOutsourceBalanceAccount){ return bizOutsourceBalanceAccountMapper.physicalDelete(bizOutsourceBalanceAccount); };
+
+}

src/main/java/cn/ezhizao/project/business/supplier/controller/BizSupplierController.java

@@ -6,6 +6,8 @@ import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
 import cn.ezhizao.framework.web.controller.BaseController;
 import cn.ezhizao.framework.web.domain.AjaxResult;
 import cn.ezhizao.framework.web.page.TableDataInfo;
+import cn.ezhizao.project.business.outsourceBalanceAccount.domain.BizOutsourceBalanceAccount;
+import cn.ezhizao.project.business.outsourceBalanceAccount.service.IBizOutsourceBalanceAccountService;
 import cn.ezhizao.project.business.supplier.domain.*;
 import cn.ezhizao.project.business.supplier.service.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -14,8 +16,10 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 供应商 biz_supplier
@@ -37,6 +41,8 @@ public class BizSupplierController extends BaseController {
     @Resource
     private IBizSupplierContactsService iBizSupplierContactsService;
     @Resource
+    private IBizOutsourceBalanceAccountService iBizOutsourceBalanceAccountService;
+    @Resource
     private HttpServletRequest request;
 
     /**
@@ -179,6 +185,27 @@ public class BizSupplierController extends BaseController {
     @PostMapping("/saveSupplierProductProcess")
     public AjaxResult saveSupplierProductProcess(@RequestBody List<BizSupplierProductProcess> data) {
         boolean bool = iBizSupplierProductProcessService.saveOrUpdateBatch(data);
+        //更新外协结算数据
+        if(!data.isEmpty()) {
+            Long productId = data.get(0).getProductId();
+            List<Long> technologicalProcessIds = data.stream().map(BizSupplierProductProcess::getTechnologicalProcessId).collect(Collectors.toList());
+            //对应产品的工序
+            List<BizOutsourceBalanceAccount> list = iBizOutsourceBalanceAccountService.query()
+                    .eq("product_id", productId).in("technological_process_id", technologicalProcessIds)
+                    .eq("status",0)
+                    .list();
+            List<BizOutsourceBalanceAccount> totalList = new ArrayList<>();
+            data.forEach(v->{
+                List<BizOutsourceBalanceAccount> currentProcessList = list.stream().filter(v1 -> v1.getTechnologicalProcessId().equals(v.getTechnologicalProcessId()) && v1.getTechnologyVersion().equals(v.getTechnologyVersion())&& v1.getProcessStepNumber().equals(v.getProcessStepNumber())).collect(Collectors.toList());
+                if(!currentProcessList.isEmpty()){
+                    currentProcessList.forEach(v1->{
+                        v1.setProcessPrice(v.getPrice());
+                    });
+                    totalList.addAll(currentProcessList);
+                }
+            });
+            iBizOutsourceBalanceAccountService.updateBatchById(totalList);
+        }
         return bool ? success("操作成功!") : error("操作失败!");
     }
     @Log(title = "外协商", businessType = BusinessType.DELETE)

src/main/java/cn/ezhizao/project/system/controller/SysUserController.java

@@ -401,6 +401,7 @@ public class SysUserController extends BaseController {
     public AjaxResult edit(@Validated @RequestBody SysUser user) throws NoSuchFieldException, IllegalAccessException {
         userService.checkUserAllowed(user);
         userService.checkUserDataScope(user.getUserId());
+        user.setTenantId(user.getUsageCompanyId());
         if(user.getTenantId() == null) {
             String tenantId = request.getHeader("tenantId");
             user.setTenantId(Long.valueOf(tenantId));

src/main/resources/mybatis/business/outsourceBalanceAccount/BizOutsourceBalanceAccountMapper.xml

@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.ezhizao.project.business.outsourceBalanceAccount.mapper.BizOutsourceBalanceAccountMapper">
+
+    <resultMap type="cn.ezhizao.project.business.outsourceBalanceAccount.domain.BizOutsourceBalanceAccount" id="BizOutsourceBalanceAccountResult">
+        <id column="id" property="id"/>
+    </resultMap>
+
+
+    <select id="getList" parameterType="BizOutsourceBalanceAccount" resultMap="BizOutsourceBalanceAccountResult">
+        SELECT * FROM biz_outsource_balance_account
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            deleted = 0
+            <if test="supplierName != null  and supplierName != ''"> AND supplier_name like concat('%', #{supplierName}, '%')</if>
+            <if test="supplierCode != null  and supplierCode != ''"> AND supplier_code = #{supplierCode}</if>
+            <if test="settlementType != null  and settlementType != ''"> AND settlement_type = #{settlementType}</if>
+            <if test="lotCode != null  and lotCode != ''"> AND lot_code = #{lotCode}</if>
+            <if test="productCode != null  and productCode != ''"> AND product_code = #{productCode}</if>
+            <if test="productDescription != null  and productDescription != ''"> AND product_description = #{productDescription}</if>
+            <if test="technologyVersion != null  and technologyVersion != ''"> AND technology_version = #{technologyVersion}</if>
+            <if test="processAlias != null  and processAlias != ''"> AND process_alias = #{processAlias}</if>
+            <if test="processCode != null  and processCode != ''"> AND process_code = #{processCode}</if>
+            <if test="processStepNumber != null  and processStepNumber != ''"> AND process_step_number = #{processStepNumber}</if>
+            <if test="productNum != null "> AND product_num = #{productNum}</if>
+            <if test="productionNum != null "> AND production_num = #{productionNum}</if>
+            <if test="outputNum != null "> AND output_num = #{outputNum}</if>
+            <if test="receiptNum != null "> AND receipt_num = #{receiptNum}</if>
+            <if test="processPrice != null "> AND process_price = #{processPrice}</if>
+            <if test="fillDifferencePrice != null "> AND fill_difference_price = #{fillDifferencePrice}</if>
+            <if test="otherCost != null "> AND other_cost = #{otherCost}</if>
+            <if test="actualInventory != null "> AND actual_inventory = #{actualInventory}</if>
+            <if test="materialLoss != null "> AND material_loss = #{materialLoss}</if>
+            <if test="materialLossAmount != null "> AND material_loss_amount = #{materialLossAmount}</if>
+            <if test="planAmount != null "> AND plan_amount = #{planAmount}</if>
+            <if test="acutalAmount != null "> AND acutal_amount = #{acutalAmount}</if>
+            <if test="taxAmount != null "> AND tax_amount = #{taxAmount}</if>
+            <if test="freightAmount != null "> AND freight_amount = #{freightAmount}</if>
+            <if test="materialPrice != null "> AND material_price = #{materialPrice}</if>
+            <if test="salePrice != null "> AND sale_price = #{salePrice}</if>
+            <if test="wastePrice != null "> AND waste_price = #{wastePrice}</if>
+            <if test="carrierNum != null "> AND carrier_num = #{carrierNum}</if>
+            <if test="processSort != null "> AND process_sort = #{processSort}</if>
+            <if test="checkoutDate != null "> AND checkout_date = #{checkoutDate}</if>
+            <if test="auditDate != null "> AND audit_date = #{auditDate}</if>
+            <if test="returnDate != null "> AND return_date = #{returnDate}</if>
+            <if test="returnNo != null  and returnNo != ''"> AND return_no = #{returnNo}</if>
+            <if test="outsourceNo != null  and outsourceNo != ''"> AND outsource_no = #{outsourceNo}</if>
+            <if test="furnaceNum != null "> AND furnace_num = #{furnaceNum}</if>
+            <if test="checkDate != null "> AND check_date = #{checkDate}</if>
+            <if test="inspectionNo != null  and inspectionNo != ''"> AND inspection_no = #{inspectionNo}</if>
+            <if test="materialLossRatio != null "> AND material_loss_ratio = #{materialLossRatio}</if>
+            <if test="surfaceTreatment != null  and surfaceTreatment != ''"> AND surface_treatment = #{surfaceTreatment}</if>
+            <if test="length != null "> AND length = #{length}</if>
+            <if test="materialDiameter != null "> AND material_diameter = #{materialDiameter}</if>
+            <if test="tolerance != null "> AND tolerance = #{tolerance}</if>
+            <if test="utilizationRatio != null "> AND utilization_ratio = #{utilizationRatio}</if>
+            <if test="currency != null  and currency != ''"> AND currency = #{currency}</if>
+            <if test="taxRate != null "> AND tax_rate = #{taxRate}</if>
+            <if test="year != null  and year != ''"> AND year = #{year}</if>
+            <if test="month != null  and month != ''"> AND month = #{month}</if>
+            <if test="wastePriceCategory != null  and wastePriceCategory != ''"> AND waste_price_category = #{wastePriceCategory}</if>
+            <if test="rawMaterialCode != null  and rawMaterialCode != ''"> AND raw_material_code = #{rawMaterialCode}</if>
+            <if test="density != null "> AND density = #{density}</if>
+            <if test="shape != null  and shape != ''"> AND shape = #{shape}</if>
+            <if test="type != null  and type != ''"> AND type = #{type}</if>
+            <if test="status != null "> AND status = #{status}</if>
+            <if test="isWasteRecycling != null "> AND is_waste_recycling = #{isWasteRecycling}</if>
+            <if test="isAmend != null "> AND is_amend = #{isAmend}</if>
+        </trim>
+    </select>
+
+    <delete id="physicalDelete">
+        DELETE FROM biz_outsource_balance_account
+        <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
+            <if test="id != null">
+                id = #{id} AND
+            </if>
+       <!-- 删除条件为其他外键可以在这里加 -->
+        </trim>
+    </delete>
+</mapper>