开票

zjugis-business/src/main/java/com/zjugis/business/bean/entity/ContractInvoice.java

@@ -190,6 +190,10 @@ public class ContractInvoice extends BaseEntity {
      * 付款单位
      */
     private String payCompany;
+    /**
+     * 付款单位ID
+     */
+    private String payCompanyId;
     /**
      * 付款单位税号
      */

zjugis-business/src/main/java/com/zjugis/business/service/impl/ContractInvoiceServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zjugis.business.bean.dto.ContractInvoiceDto;
 import com.zjugis.business.bean.entity.Contract;
 import com.zjugis.business.bean.entity.ContractInvoice;
+import com.zjugis.business.bean.entity.Customer;
 import com.zjugis.business.bean.response.ContractInvoiceResponse;
 import com.zjugis.business.bean.response.ContractInvoiceStaticsRespense;
 import com.zjugis.business.constants.FlowStatusConstants;
@@ -13,6 +14,7 @@ import com.zjugis.business.mapper.ContractInvoiceMapper;
 import com.zjugis.business.service.ContractInvoiceService;
 import com.zjugis.business.service.ContractMilestoneService;
 import com.zjugis.business.service.ContractService;
+import com.zjugis.business.service.CustomerService;
 import com.zjugis.framework.common.exception.ServiceException;
 import com.zjugis.framework.common.pojo.CommonResult;
 import com.zjugis.framework.security.core.util.SecurityFrameworkUtils;
@@ -39,6 +41,9 @@ import static com.zjugis.business.constants.ResponseStatusEnum.CONTRACT_NOT_EXIS
 @Service
 public class ContractInvoiceServiceImpl implements ContractInvoiceService {
 
+    @Autowired
+    CustomerService customerService;
+
     @Autowired
     ContractInvoiceMapper contractInvoiceMapper;
 
@@ -116,6 +121,19 @@ public class ContractInvoiceServiceImpl implements ContractInvoiceService {
         invoice.setInstanceId(UrlUtils.getParam(returnUrl,"flowInstanceId"));
         invoice.setContractId(contractId);
         invoice.setProjectId(contract.getProjectId());
+        invoice.setReceiveBankaccount("浙江万维空间信息技术有限公司  江苏银行杭州分行营业部  33200188000384287");
+        if(StringUtils.isNotBlank(contract.getClientId())){
+            Customer customer = customerService.queryById(contract.getClientId());
+            invoice.setCustomerName(customer.getCustomerName());
+            invoice.setPayCompany(customer.getCustomerName());
+            invoice.setPayCompanyId(customer.getId());
+            invoice.setTaxNumber(customer.getTaxNumber());
+            invoice.setPayTaxNumber(customer.getTaxNumber());
+            invoice.setPayAddress(customer.getPayAddress());
+            invoice.setPayBank(customer.getBank());
+            invoice.setBank(customer.getBank());
+            invoice.setBankaccount(customer.getBankaccount());
+        }
         AdminUserRespDTO user = userResp.getCheckedData();
         invoice.setApplyWorkerName(user.getNickname());
         invoice.setWorkerId(userId);

zjugis-business/src/main/resources/mapper/oracle/ContractMapper.xml

@@ -98,7 +98,7 @@
             ) r ON t.ID = r.CONTRACT_INVOICE_ID
         WHERE
             t.CONTRACT_ID = #{contractId,jdbcType=VARCHAR}
-            AND t.ISVALID = 1 AND t.FLOW_STATUS = 90
+            AND t.ISVALID = 1 AND t.FLOW_STATUS >= 90
     </select>
 
     <select id="selectVirtualList" resultType="com.zjugis.business.bean.entity.Contract">

zjugis-business/src/main/resources/templates/FlowContractInvoice/apply.ftl

@@ -9,7 +9,9 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
   <div class="z-position form-boss ow-tabs" name="flow-form">
       <ul class="ow-tab-nav oa_tabBox">
           <li z-tabindex="0" class="ow-tab-item on" data-name="jbxx">基础信息</li>
-          <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+          <#if WORKFLOW.OPINION! !="">
+              <li z-tabindex="1" class="ow-tab-item" data-name="yj">审批意见</li>
+          </#if>
       </ul>
 
       <div class="ow-tab-scroll">
@@ -157,7 +159,7 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                           <td class="th">
                               <div class="form-label">项目责任部门：</div>
                           </td>
-                          <td colspan="3">
+                          <td>
                               <div class="form-group">
                                   <div class="form-item">
                                       <div class="z-comp-input" name="project$zrbm">
@@ -166,6 +168,18 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                                   </div>
                               </div>
                           </td>
+                          <td class="th">
+                              <div class="form-label">销售经理：</div>
+                          </td>
+                          <td>
+                              <div class="form-group">
+                                  <div class="form-item">
+                                      <div class="z-comp-input" name="project$xsry">
+                                          <input type="text" value="${(project.xsry)!}">
+                                      </div>
+                                  </div>
+                              </div>
+                          </td>
                       </tr>
                   </table>
               </div>
@@ -285,21 +299,6 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                               </div>
                           </td>
                       </tr>
-                      <tr>
-                          <td class="th">
-                              <div class="form-label">开票单位：</div>
-                          </td>
-                          <td colspan="3">
-                              <div class="form-group">
-                                  <div class="form-item">
-                                      <div class="z-comp-input" name="contractInvoice$invoiceCompany">
-                                          <input type="text" value="${formEntity.bank!}">
-                                      </div>
-                                  </div>
-                              </div>
-                          </td>
-                      </tr>
-
                       <tr>
                           <td class="th">
                               <div class="form-label">开票金额：</div>
@@ -320,7 +319,7 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                               <div class="form-group">
                                   <div class="form-item">
                                       <div class="z-comp-select" name="contractInvoice$invoiceType"
-                                           data='${invoiceTypeList!}'>
+                                           data='${invoiceTypeList!}' value="${formEntity.invoiceType!}">
                                           <div class="z-inputselect-bar">
                                               <span> ${invoiceType!} </span><i></i>
                                           </div>
@@ -394,8 +393,12 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                           <td>
                               <div class="form-group">
                                   <div class="form-item">
-                                      <div class="z-comp-input" name="contractInvoice$payCompany">
-                                          <input type="text" value="${formEntity.payCompany!}">
+                                      <div class="z-comp-selecttree" name="payCompany">
+                                          <input type="hidden" name="contractInvoice$payCompanyId" value="${formEntity.payCompanyId!}">
+                                          <input type="hidden" name="contractInvoice$payCompany" value="${formEntity.payCompany!}">
+                                          <div class="z-inputselect-bar">
+                                              <span> ${formEntity.payCompany!} </span><i></i>
+                                          </div>
                                       </div>
                                   </div>
                               </div>
@@ -455,20 +458,6 @@ styles=[ '/flow/css/formCommon.css', '/OwCommon/OwCommon.css' ]>
                               </div>
                           </td>
                       </tr>
-                      <tr>
-                          <td class="th">
-                              <div class="form-label">收款银行账户：</div>
-                          </td>
-                          <td colspan="3">
-                              <div class="form-group">
-                                  <div class="form-item">
-                                      <div class="z-comp-input" name="contractInvoice$receiveBankaccount">
-                                          <input type="text" value="${formEntity.receiveBankaccount!}">
-                                      </div>
-                                  </div>
-                              </div>
-                          </td>
-                      </tr>
                       <tr>
                           <td class="th">
                               <div class="form-label">电子发票接收人手机号：</div>

zjugis-business/src/main/resources/templates/FlowContractInvoice/js/apply.js

@@ -26,7 +26,7 @@
     }
 
     function initData(){
-
+        initPayCompany();
     }
 
     function bindSelectMilestone(){
@@ -389,6 +389,26 @@
         }
     }
 
+    function initPayCompany(){
+        z.ui.ajax({
+            type: "get",
+            url: "/customer-tree",
+            data: {},
+            success: function (res) {
+                if(res && res.code === 0 && res.data.length > 0){
+                    selecttree("[name='payCompany']",res.data,clickPayCompany)
+                }
+            },
+            error: function () {
+            }
+        })
+    }
+
+    function clickPayCompany(even, treeId, treeNode) {
+        $("[name='contractInvoice$payCompany']").val(treeNode.name);
+        $("[name='contractInvoice$payCompanyId']").val(treeNode.id);
+    }
+
     function updateView() {
         let tbodyQjsq = document.querySelector('[name=returnMoney]')
         let html = ''