zhangyuewww 2 سال پیش
والد
کامیت
2d747c7bd6

+ 4 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/ContractManagementInfo.java

@@ -361,6 +361,10 @@ public class ContractManagementInfo extends BaseModel<ContractManagementInfo> {
      * 备注
      */
     private String remarks;
+    /**
+     * 发票编辑人
+     */
+    private String invoiceEditor;
     /**
      * 最终实际交易量
      */

+ 10 - 1
winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -708,12 +708,21 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             //流程编辑
             contractProcessInfoService.updateById(contractManagementInfo.getContractProcessInfo());
         }
-        //结算
+        //flag==2结算
         else if("2".equals(contractManagementInfo.getFlag())){
             contractManagementInfo.setProfit(contractManagementInfo.getProfit());
             contractManagementInfo.setStatusFlag(StatusEnum.CONTRACT_SETTLED.getFlag());
             contractManagementInfo.setStatus(StatusEnum.CONTRACT_SETTLED.getName());
         }
+        //flag==3修改开发票金额
+        else if("2".equals(contractManagementInfo.getFlag())){
+            ContractProcessInfo contractProcessInfo = contractProcessInfoService.selectOne(new EntityWrapper<ContractProcessInfo>().eq(ContractGoodsInfo.QueryFiles.CONTRACT_ID, contractManagementInfo.getId()));
+            if (contractProcessInfo!=null){
+                contractProcessInfo.setGoodsName(contractManagementInfo.getInvoiced());
+                contractProcessInfoService.updateById(contractProcessInfo);
+                contractManagementInfo.setInvoiceEditor(AuthSecurityUtils.getStaffById(AuthSecurityUtils.getCurrentUserId()).getStaffName());
+            }
+        }
         // 主表信息编辑
         boolean one = this.updateById(contractManagementInfo);
         // 假如 都成功返回ok

+ 1 - 0
winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/ContractManagementInfoMapper.xml

@@ -99,6 +99,7 @@
         p.mildew_grain as contractExpenditure,
         p.water_content as expenses,
         p.goods_name as invoiced,
+        m.invoice_editor as invoiceEditor,
         (SELECT IFNULL(sum(sfr.amount_money),0)
         FROM storage_fee_record_charge sfr
         WHERE sfr.delete_flag = '0'