Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/exception/BizExceptionCode.java

@@ -39,6 +39,7 @@ public enum BizExceptionCode implements BaseExceptionCode {
     PRODUCT_HAS_WAREHOUSE(79502, "存在物料默认仓库资料为该仓库资料,无法删除"),
     PRODUCTWH_HAS_WAREHOUSE(79503, "该仓库资料存在库存,无法删除"),
     ACCOUNT_EXISTS(79503, "账号已存在"),
+    USING_EXISTS(79504, ""),
 
 
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/CustomerMapper.java

@@ -4,6 +4,8 @@ import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.document.entities.Customer;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Map;
+
 public interface CustomerMapper extends CommonBaseMapper<Customer> {
     int deleteByPrimaryKey(Long cu_id);
 
@@ -27,4 +29,6 @@ public interface CustomerMapper extends CommonBaseMapper<Customer> {
     int validNameAndCodeWhenUpdate(Customer record);
 
     int validFinish(@Param("id") Long id,@Param("companyId") Long companyId);
+
+    void check(Map<String, Object> map);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/mapper/VendorMapper.java

@@ -10,6 +10,7 @@ import com.usoftchina.saas.document.entities.VendorList;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface VendorMapper extends CommonBaseMapper<Vendor> {
 
@@ -28,4 +29,6 @@ public interface VendorMapper extends CommonBaseMapper<Vendor> {
     int getCountByName(@Param("name") String name, @Param("companyId") Long companyId);
 
     int validFinish(@Param("id") Long id,@Param("companyId") Long companyId);
+
+    void check(Map<String, Object> map);
 }

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/CustomerServiceImpl.java

@@ -28,9 +28,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * Created by zdw
@@ -55,6 +53,8 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
     private MaxnumberService maxnumberService;
     @Autowired
     private SubledgerMapper subledgerMapper;
+    @Autowired
+    private CustomerMapper customerMapper;
 
 
     @Override
@@ -294,17 +294,28 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
     private void singleDelete(Long id) {
         if (null!=id) {
             DocBaseDTO docBaseDTO = getBaseDTOById(id);
-            //主表删除
-            getMapper().deleteByPrimaryKey(id);
-            //从表删除
-            customercontactMapper.deleteByFK(id);
-            customeraddressMapper.deleteByFK(id);
-
-            //删除中间表
-            subledgerMapper.deleteCustomer("期初余额", "期初余额", Math.toIntExact(id));
-
-            //日志
-            messageLogService.delete(docBaseDTO);
+            Map<String, Object> map = new HashMap<String, Object>();
+            map.put("v_id",id);
+            map.put("v_code", docBaseDTO.getCode());
+            map.put("v_type","cust");
+            map.put("v_res","");
+            customerMapper.check(map);
+            Object result =  map.get("v_res");
+            if(!StringUtils.isEmpty(result)){
+                throw new BizException(BizExceptionCode.USING_EXISTS.getCode(),result.toString());
+            }else{
+                //主表删除
+                getMapper().deleteByPrimaryKey(id);
+                //从表删除
+                customercontactMapper.deleteByFK(id);
+                customeraddressMapper.deleteByFK(id);
+
+                //删除中间表
+                subledgerMapper.deleteCustomer("期初余额", "期初余额", Math.toIntExact(id));
+
+                //日志
+                messageLogService.delete(docBaseDTO);
+            }
         }
     }
 

applications/document/document-server/src/main/java/com/usoftchina/saas/document/service/impl/VendorServiceImpl.java

@@ -2,6 +2,7 @@ package com.usoftchina.saas.document.service.impl;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.usoftchina.saas.base.Result;
 import com.usoftchina.saas.base.service.CommonBaseServiceImpl;
 import com.usoftchina.saas.commons.api.MaxnumberService;
 import com.usoftchina.saas.commons.api.MessageLogService;
@@ -27,11 +28,10 @@ import com.usoftchina.saas.page.PageRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StringUtils;
 
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author chenwei
@@ -48,6 +48,8 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
     private MaxnumberService maxnumberService;
     @Autowired
     private SubledgerMapper subledgerMapper;
+    @Autowired
+    private VendorMapper vendorMapper;
 
     @Override
     public PageInfo<VendorDTO> getVendorsByCondition(PageRequest page, ListReqDTO listReqDTO) {
@@ -257,14 +259,24 @@ public class VendorServiceImpl extends CommonBaseServiceImpl<VendorMapper, Vendo
     @Override
     public void deleteById(Long id) {
         if(id != null && id > 0){
-            getMapper().deleteByPrimaryKey(id);
-            vendorcontactMapper.deleteByFK(id);
-            String code = getMapper().getCodeById(id, BaseContextHolder.getCompanyId());
-
-            //删除中间表
-            subledgerMapper.deleteVendor("期初余额", "期初余额", Math.toIntExact(id));
-            //记录LOG
-            messageLogService.delete(generateMsgObj(id, code));
+            String code = getMapper().getCodeById(id, new Long(1));
+            Map<String, Object> map = new HashMap<String, Object>();
+            map.put("v_id",id);
+            map.put("v_code", code);
+            map.put("v_type","vend");
+            map.put("v_res","");
+            vendorMapper.check(map);
+            Object result =  map.get("v_res");
+            if(!StringUtils.isEmpty(result)){
+                throw new BizException(BizExceptionCode.USING_EXISTS.getCode(),result.toString());
+            }else{
+                getMapper().deleteByPrimaryKey(id);
+                vendorcontactMapper.deleteByFK(id);
+                //删除中间表
+                subledgerMapper.deleteVendor("期初余额", "期初余额", Math.toIntExact(id));
+                //记录LOG
+                messageLogService.delete(generateMsgObj(id, code));
+            }
         }
     }
 

applications/document/document-server/src/main/resources/mapper/CustomerMapper.xml

@@ -391,7 +391,15 @@
   select count(1) from periodsdetail where pd_status=99 and pd_detno=(select DATE_FORMAT(cu_begindate,'%Y%m') from customer where cu_id =#{id})
   and companyId =#{companyId};
   </select>
-
+  <select id="check" parameterMap="checkParamMap" statementType="CALLABLE">
+        CALL SP_LIMITBASE(?, ?, ?, ?)
+    </select>
+  <parameterMap id="checkParamMap" type="java.util.Map">
+    <parameter property="v_type" jdbcType="VARCHAR" mode="IN" />
+    <parameter property="v_id" jdbcType="INTEGER" mode="IN" />
+    <parameter property="v_code" jdbcType="VARCHAR" mode="IN" />
+    <parameter property="v_res" jdbcType="VARCHAR" mode="OUT" />
+  </parameterMap>
 
 
 </mapper>

applications/document/document-server/src/main/resources/mapper/VendorMapper.xml

@@ -477,5 +477,14 @@
         and companyId =#{companyId};
     </select>
 
+    <select id="check" parameterMap="checkParamMap" statementType="CALLABLE">
+        CALL SP_LIMITBASE(?, ?, ?, ?)
+    </select>
+    <parameterMap id="checkParamMap" type="java.util.Map">
+        <parameter property="v_type" jdbcType="VARCHAR" mode="IN" />
+        <parameter property="v_id" jdbcType="INTEGER" mode="IN" />
+        <parameter property="v_code" jdbcType="VARCHAR" mode="IN" />
+        <parameter property="v_res" jdbcType="VARCHAR" mode="OUT" />
+    </parameterMap>
 </mapper>
 

applications/money/money-server/src/main/resources/mapper/OthspendingsMapper.xml

@@ -33,8 +33,8 @@
   <sql id="Base_Column_List" >
     os_id, os_code, os_date, os_vendid, os_vendcode, os_vendname, os_bankid, os_bankcode, 
     os_bankname, os_amount, os_recorderid, os_recorder, os_recorddate, os_status, os_statuscode, 
-    os_remark, companyId, updaterId,
-    updatedate, os_text1, os_text2, os_text3, os_text4,
+    os_remark, othspendings.companyId, othspendings.updaterId,
+    othspendings.updatedate, os_text1, os_text2, os_text3, os_text4,
     os_text5
   </sql>
   <sql id="Detail_Column_List" >

frontend/saas-web/app/view/money/fundtransfer/FormPanel.js

@@ -190,6 +190,15 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
         name : "createTime",
         fieldLabel : "录入日期",
         readOnly:true
-    }
-    ]
+    },{
+        xtype: 'textfield',
+        name: 'ft_auditman',
+        fieldLabel: '审核人',
+        hidden: true
+    },{
+        xtype: "datefield",
+        name: "ft_auditdate",
+        fieldLabel: "审核日期",
+        hidden: true
+    }]
 });

frontend/saas-web/app/view/money/fundtransfer/QueryPanel.js

@@ -11,17 +11,23 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         xtype : "textfield",
         name : "ft_code",
         fieldLabel : "单据编号",
-        columnWidth: 0.3
+    },{
+        xtype : "textfield",
+        name : "ft_recorder",
+        fieldLabel : "制单人",
+    },{
+        xtype : "textfield",
+        name : "ft_auditman",
+        fieldLabel : "审核人",
     },{
         xtype : "condatefield",
         name : "ft_date",
         fieldLabel : "单据日期",
-        columnWidth: 0.6
+        columnWidth: 0.5
     },{
         xtype: 'multicombo',
         name: 'ft_status',
         fieldLabel: '审核状态',
-        columnWidth: 0.3,
         datas: [
             ["已审核", "已审核"],
             ["未审核", "未审核"]
@@ -29,7 +35,6 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
     },{
         name : "ft_status",
         fieldLabel : "结算方式",
-        columnWidth: 0.3,
         xtype:'combo',
         queryMode: 'local',
         displayField: 'display',
@@ -50,12 +55,10 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         xtype : "dbfindtrigger",
         name : "ftd_bankname",
         fieldLabel : "转出账号",
-        columnWidth: 0.3
     },{
         xtype : "dbfindtrigger",
         name : "ftd_inbankname",
         fieldLabel : "转入账号",
-        columnWidth: 0.3
     }],
     moreQueryFormItems: [],
     queryGridConfig: {
@@ -88,6 +91,10 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
             dataIndex: 'ft_recorder',
             width: 120
         }, {
+            text: '审核人',
+            dataIndex: 'ft_auditman',
+            width: 120
+        },{
             text: '转出账户',
             dataIndex: 'ftd_bankname',
             width: 120

frontend/saas-web/app/view/money/othreceipts/FormPanel.js

@@ -160,7 +160,15 @@ Ext.define('saas.view.money.othreceipts.FormPanel', {
         name : "or_recorddate",
         fieldLabel : "录入日期",
         readOnly:true
-    }
-
-    ]
+    },{
+        xtype: 'textfield',
+        name: 'or_auditman',
+        fieldLabel: '审核人',
+        hidden: true
+    },{
+        xtype: "datefield",
+        name: "or_auditdate",
+        fieldLabel: "审核日期",
+        hidden: true
+    }]
 });

frontend/saas-web/app/view/money/othreceipts/QueryPanel.js

@@ -21,7 +21,6 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         xtype: 'textfield',
         name: 'or_code',
         fieldLabel: '单据编号',
-        columnWidth: 0.3
     }, {
         xtype: 'hidden',
         name: 'or_custcode',
@@ -30,31 +29,28 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         xtype: 'dbfindtrigger',
         name: 'or_custname',
         fieldLabel: '客户名称',
-        columnWidth: 0.3
-    }, {
-        xtype : 'hidden',
-        name : 'or_bankid', 
-        fieldLabel : '账户ID'
-     }, {
-        xtype: 'hidden',
-        name: 'or_bankcode',
-        fieldLabel: '账户编号'
     }, {
+        xtype: 'textfield',
+        name: 'or_recorder',
+        fieldLabel: '制单人'
+    },{
+        xtype: 'textfield',
+        name: 'or_auditman',
+        fieldLabel: '审核人'
+    },  {
         xtype: 'dbfindtrigger',
         name: 'or_bankname',
-        columnWidth: 0.3,
         fieldLabel: '账户名称'
     }, {
         xtype: 'condatefield',
         name: 'or_date',
         fieldLabel: '单据日期',
-        columnWidth: 0.6,
+        columnWidth: 0.5,
         operation: 'between'
     }, {
         xtype: 'multicombo',
         name: 'or_status',
         fieldLabel: '审核状态',
-        columnWidth: 0.3,
         datas: [
             ["已审核", "已审核"],
             ["未审核", "未审核"]
@@ -62,7 +58,6 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
     }, {
         name: 'ord_type',
         fieldLabel: '收入类别',
-        columnWidth: 0.3,
         xtype : "remotecombo",
         storeUrl:'/api/document/fundinouttype/getCombo?condition=收入',
     }],
@@ -102,7 +97,7 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             dataIndex: 'or_bankname',
             width: 120
         },{
-            text: '金额',
+            text: '收款金额',
             xtype: 'numbercolumn',
             dataIndex: 'or_amount',
             width: 120,
@@ -116,6 +111,10 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
             text: '录入人',
             dataIndex: 'or_recorder',
             width: 120
+        },{
+            text: '审核人',
+            dataIndex: 'or_auditman',
+            width: 120
         }, {
             text: '收入类别',
             dataIndex: 'ord_type',

frontend/saas-web/app/view/money/othspendings/FormPanel.js

@@ -160,6 +160,15 @@ Ext.define('saas.view.money.othspendings.FormPanel', {
         name : "os_recorddate",
         fieldLabel : "录入日期",
         readOnly:true
-    }
-    ]
+    },{
+        xtype: 'textfield',
+        name: 'os_auditman',
+        fieldLabel: '审核人',
+        hidden: true
+    },{
+        xtype: "datefield",
+        name: "os_auditdate",
+        fieldLabel: "审核日期",
+        hidden: true
+    }]
 });

frontend/saas-web/app/view/money/othspendings/QueryPanel.js

@@ -21,40 +21,35 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         xtype : 'textfield',
         name : 'os_code',
         fieldLabel : '单据编号',
-        columnWidth: 0.3,
     }, {
         xtype: 'hidden',
         name: 'os_vendcode',
         fieldLabel: '供应商编号',
-        columnWidth: 0.3,
     }, {
         xtype: 'dbfindtrigger',
         name: 'os_vendname',
-        fieldLabel: '供应商名称',
-        columnWidth: 0.3
+        fieldLabel: '供应商名称'
+    }, {
+        xtype: 'textfield',
+        name: 'os_recorder',
+        fieldLabel: '制单人',
     }, {
-        xtype : 'hidden',
-        name : 'os_bankid', 
-        fieldLabel : '结算账户ID'
-     }, {
         xtype: 'hidden',
-        name: 'os_bankcode',
-        fieldLabel: '结算账户编号'
+        name: 'os_auditman',
+        fieldLabel: '审核人',
     }, {
         xtype: 'dbfindtrigger',
         name: 'os_bankname',
         fieldLabel: '结算账户',
-        columnWidth: 0.3
     },{
         xtype: 'condatefield',
         name: 'os_date',
-        columnWidth: 0.6,
+        columnWidth: 0.5,
         fieldLabel: '单据日期'
     },{
         xtype: 'multicombo',
         name: 'os_status',
         fieldLabel: '审核状态',
-        columnWidth: 0.3,
         datas: [
             ["已审核", "已审核"],
             ["未审核", "未审核"]
@@ -62,7 +57,6 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
     },{
         name: 'ord_type',
         fieldLabel: '支出类别',
-        columnWidth: 0.3,
         xtype : "remotecombo",
         storeUrl:'/api/document/fundinouttype/getCombo?condition=支出',
     }],

frontend/saas-web/app/view/money/payBalance/FormPanel.js

@@ -374,6 +374,16 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: 'hidden',
         name: 'pb_text5',
         fieldLabel: '自定义字段5'
+    },{
+        xtype: 'textfield',
+        name: 'pb_auditman',
+        fieldLabel: '审核人',
+        hidden: true
+    },{
+        xtype: "datefield",
+        name: "pb_auditdate",
+        fieldLabel: "审核日期",
+        hidden: true
     }],
 
     beforeAudit: function() {

frontend/saas-web/app/view/money/payBalance/QueryPanel.js

@@ -11,33 +11,28 @@ Ext.define('saas.view.money.paybalance.QueryPanel', {
         xtype: 'textfield',
         name: 'pb_code',
         fieldLabel: '单据编号',
-        columnWidth: 0.3
     },{
         xtype: 'dbfindtrigger',
         name: 'pb_vendname',
         fieldLabel: '供应商',
-        columnWidth: 0.3
     },{
         xtype: 'textfield',
         name: 'pb_manname',
         fieldLabel: '付款人',
-        columnWidth: 0.3
     },{
         xtype: 'dbfindtrigger',
         name: 'pd_bankname',
         fieldLabel: '资金账户',
-        columnWidth: 0.3
     },{
         xtype: 'condatefield',
         name: 'pb_date',
         fieldLabel: '单据日期',
-        columnWidth: 0.6,
+        columnWidth: 0.5,
         operation: 'between'
     },{
         xtype: 'multicombo',
         name: 'pb_status',
         fieldLabel: '审核状态',
-        columnWidth: 0.3,
         datas: [
             ["已审核", "已审核"],
             ["未审核", "未审核"]

frontend/saas-web/app/view/money/recBalance/FormPanel.js

@@ -343,6 +343,16 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         name: "rb_recorddate",
         fieldLabel: "录入日期",
         hidden: true
+    }, {
+        xtype: 'textfield',
+        name: 'rb_auditman',
+        fieldLabel: '审核人',
+        hidden: true
+    },{
+        xtype: "datefield",
+        name: "rb_auditdate",
+        fieldLabel: "审核日期",
+        hidden: true
     }],
 
     beforeAudit: function() {

frontend/saas-web/app/view/money/recBalance/QueryPanel.js

@@ -19,33 +19,28 @@ Ext.define('saas.view.money.recBalance.QueryPanel', {
         xtype: 'textfield',
         name: 'rb_code',
         fieldLabel: '单据编号',
-        columnWidth: 0.3,
     }, {
         xtype: 'dbfindtrigger',
         name: 'rb_custname',
         fieldLabel: '客户名',
-        columnWidth: 0.3,
     }, {
         xtype: 'textfield',
         name: 'rb_manname',
         fieldLabel: '收款人',
-        columnWidth: 0.3,
     },{
         xtype: 'textfield',
         name: 'rd_bankname',
         fieldLabel: '资金账户',
-        columnWidth: 0.3,
     },  {
         xtype: 'condatefield',
         name: 'rb_date',
         fieldLabel: '单据日期',
-        columnWidth: 0.6,
+        columnWidth: 0.5,
         operation: 'between'
     },{
         xtype: 'multicombo',
         name: 'rb_status',
         fieldLabel: '审核状态',
-        columnWidth: 0.3,
         datas: [
             ["已审核", "已审核"],
             ["未审核", "未审核"]