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/po/BillCodeSeq.java

@@ -50,6 +50,10 @@ public enum  BillCodeSeq {
 
     FUNDTRANSFER ("资金转存","FundTransfer"),
 
+    ENDPRODUCT ("结账", "ENDPRODUCT"),
+
+    UNENDPRODUCT ("反结账", "UNENDPRODUCT"),
+
     BOM("BOM资料", "Bom");
 
 

applications/commons/commons-server/src/main/java/com/usoftchina/saas/commons/service/impl/EndProductServiceImpl.java

@@ -69,7 +69,7 @@ public class EndProductServiceImpl implements EndProductService {
         endProductMapper.end(map);
         endProductMapper.updatePeriodStatus(99L, period, BaseContextHolder.getCompanyId());
         DocBaseDTO docBaseDTO = generateMsgObj(Long.parseLong(period));
-        messageLogService.customizeLog(docBaseDTO, Operation.ENDPRODUCT);
+        messageLogService.customizeLog(new DocBaseDTO(Long.valueOf(period), period, "ENDPRODUCT"), Operation.ENDPRODUCT);
         return String.valueOf(map.get("result"));
     }
 
@@ -90,7 +90,7 @@ public class EndProductServiceImpl implements EndProductService {
             endProductMapper.updateRe(period, BaseContextHolder.getCompanyId());
             endProductMapper.updatePa(period, BaseContextHolder.getCompanyId());
             endProductMapper.updatePeriodStatus(0L, period, BaseContextHolder.getCompanyId());
-            messageLogService.customizeLog(generateMsgObj(Long.parseLong(period)), Operation.UNENDPRODUCT);
+            messageLogService.customizeLog(new DocBaseDTO(Long.valueOf(period), period, "UNENDPRODUCT"), Operation.UNENDPRODUCT);
         }
     }
     /**

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

@@ -58,6 +58,7 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
         bankinformation.setCreatorId(BaseContextHolder.getUserId());
         bankinformation.setCreatorName(BaseContextHolder.getUserName());
         int bid = Math.toIntExact(bankinformation.getId());
+        DocBaseDTO docBaseDTO = new DocBaseDTO();
 
         String bk_code = RegexpUtils.replaceSpecCharacter(bankinformation.getBk_bankcode());
         String code = pushMaxnubmer(bk_code, bankinformation.getId());
@@ -72,9 +73,15 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
             bankinformation.setBk_thisamount(bankinformation.getBk_beginamount());
             bankinformation.setBk_bankcode(code);
             bankinformationMapper.insertSelective(bankinformation);
+
+            docBaseDTO.setId(bankinformation.getId());
+            docBaseDTO.setCode(code);
+            docBaseDTO.setName(BillCodeSeq.BANKINFORMATION.getCaller());
+            messageLogService.save(docBaseDTO);
             Banksubledger banksubledger = this.changBanksubledger(bankinformation);
             banksubledgerMapper.insertSelective(banksubledger);
         }else {
+            docBaseDTO = this.getBaseDTOById(bid);
             bankinformation.setUpdaterId(BaseContextHolder.getUserId());
             bankinformation.setUpdaterName(BaseContextHolder.getUserName());
             bankinformation.setUpdateTime(new Date());
@@ -83,7 +90,6 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
             Double fbeginamount = bankinformation.getBk_beginamount();
             bankinformation.setBk_thisamount(bankinformation.getBk_beginamount());
             if (!(fbeginamount.equals(beginamount))){
-                DocBaseDTO docBaseDTO = getBaseDTOById(bid);
                 Map<String, Object> map = new HashMap<String, Object>();
                 map.put("v_id",bid);
                 map.put("v_code", docBaseDTO.getCode());
@@ -101,11 +107,13 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
             if (bktion != null){
                 if (id.equals(bankinformation.getId())){
                     bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
+                    messageLogService.update(docBaseDTO);
                 }else {
                     throw new BizException(500, BizExceptionCode.ACCOUNT_EXISTS.getMessage());
                 }
             }else {
                 bankinformationMapper.updateByPrimaryKeySelective(bankinformation);
+                messageLogService.update(docBaseDTO);
             }
             Banksubledger banksubledger = this.changBanksubledger(bankinformation);
             banksubledgerMapper.updateByPrimaryKeySelective(banksubledger);
@@ -138,7 +146,7 @@ public class BankinformationServiceImpl extends CommonBaseServiceImpl<Bankinform
 
     private DocBaseDTO getBaseDTOById(int id) {
         String code = bankinformationMapper.selectByPrimaryKey(id).getBk_bankcode();
-        DocBaseDTO baseDTO = new DocBaseDTO(Long.valueOf(String.valueOf(id)), code, "BankInformation");
+        DocBaseDTO baseDTO = new DocBaseDTO(Long.valueOf(String.valueOf(id)), code, BillCodeSeq.BANKINFORMATION.getCaller());
         return baseDTO;
     }
     @Override

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

@@ -24,7 +24,7 @@
         and  companyId = #{companyId}
       </if>
     </where>
-    order by date desc
+    order by sl_code desc ,date desc
   </select>
 
   <select id="selectCalculateFields" resultType="string">

framework/core/src/main/java/com/usoftchina/saas/exception/ExceptionCode.java

@@ -58,7 +58,7 @@ public enum ExceptionCode implements BaseExceptionCode {
     FILE_NOT_FOLDER(55501, "不是文件夹"),
 
     TURNIN_EXIST(60000,"已入库"),
-    TURNINNUM_NOT_EXIST(60001,"无可转数"),
+    TURNINNUM_NOT_EXIST(60001,"该采购单已全部转验收,无法转采购验收单"),
 
     CLOSED_EXIST(60002,"已关闭")
 

framework/core/src/main/java/com/usoftchina/saas/utils/RegexpUtils.java

@@ -12,7 +12,7 @@ public class RegexpUtils {
     private static final String HK_MOBILE_EXP = "^(5|6|8|9)\\d{7}$";
     private static final String EMAIL_EXP = "^\\w+([-.]\\w+)*@\\w+([-]\\w+)*\\.(\\w+([-]\\w+)*\\.)*[a-z]{2,4}$";
     private static final String SPECCHARACTER_EXP = "[\\\\s~·`!！@#￥$%^……&*（()）\\\\-——\\\\-_=+【\\\\[\\\\]】｛{}｝\\\\|、\\\\\\\\；;：:‘'“”\\\"，,《<。.》>、/？?]";
-    private static final String SPECIALCHARACTER_EXP = "[`~!@#$%^&*()+=|{}':;',\\[\\]<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]";
+    private static final String SPECIALCHARACTER_EXP = "[`~!@#$%^&*()+=|{}':;',\\[\\]<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？\"]";
     /**
      * 匹配手机号码
      *

frontend/saas-web/app/Application.scss

@@ -292,11 +292,13 @@ body.launching {
 }
 
 .x-grid-scrollbar-clipper-locked, .x-grid-scrollbar-locked {
-  border-right-color: #ABDAFF;
+  // border-color: #ABDAFF;
+  border-color: transparent;
 }
 
 .x-grid-inner-locked {
-  border-right-color: #ABDAFF;
+  // border-color: #ABDAFF;
+  border-color: transparent;
 }
 
 .x-grid-with-row-lines .x-grid-item:first-child {
@@ -304,7 +306,8 @@ body.launching {
 }
 
 .x-grid-with-row-lines .x-grid-item {
-  border-color: #ABDAFF;
+  // border-color: #ABDAFF;
+  border-color: transparent;
 }
 
 .x-keyboard-mode  .x-grid-item-focused .x-grid-cell-inner:before {
@@ -316,7 +319,8 @@ body.launching {
 }
 
 .x-grid-cell-special {
-  border-color: #ABDAFF;
+  // border-color: #ABDAFF;
+  border-color: transparent;
 }
 
 .x-grid-item-selected {

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

@@ -47,7 +47,10 @@ Ext.define('saas.view.money.payBalance.FormPanel', {
         xtype: "vendorDbfindTrigger",
         name: "pb_vendname",
         fieldLabel: "供应商名称",
-        allowBlank : false
+        allowBlank : false,
+        listeners: {
+            change: 'clearDetails'
+        }
     },{
         xtype:"numberfield",
         name:"ve_leftamount",

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

@@ -132,8 +132,8 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                 beforequery: function(f) {
                     var me = this,
                     viewModel = me.getViewModel(),
-                    rb_custname = viewModel.get('rb_custname');
-                    if(!rb_custname) {
+                    pb_vendname = viewModel.get('pb_vendname');
+                    if(!pb_vendname) {
                         saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">供应商名称</span>】');
                         return false;
                     }
@@ -141,8 +141,8 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                 beforetriggerclick: function(f) {
                     var me = this,
                     viewModel = me.getViewModel(),
-                    rb_custname = viewModel.get('rb_custname');
-                    if(!rb_custname) {
+                    pb_vendname = viewModel.get('pb_vendname');
+                    if(!pb_vendname) {
                         saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">供应商名称</span>】');
                         return false;
                     }
@@ -169,7 +169,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                 beforequery: function(f) {
                     var me = this,
                     viewModel = me.getViewModel(),
-                    rb_custname = viewModel.get('rb_custname');
+                    rb_custname = viewModel.get('pb_vendname');
                     if(!rb_custname) {
                         saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">供应商名称</span>】');
                         return false;
@@ -178,7 +178,7 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
                 beforetriggerclick: function(f) {
                     var me = this,
                     viewModel = me.getViewModel(),
-                    rb_custname = viewModel.get('rb_custname');
+                    rb_custname = viewModel.get('pb_vendname');
                     if(!rb_custname) {
                         saas.util.BaseUtil.showErrorToast('请先录入主表字段【' + '<span style="color: red;">供应商名称</span>】');
                         return false;
@@ -288,5 +288,57 @@ Ext.define('saas.view.money.payBalance.FormPanelController', {
         main.pb_auditman = '';
         main.pb_auditdate = null;
         return formData;
-    }
+    },
+
+    /**
+     * 清空所有从表数据
+     */
+    clearDetails: function() {
+        var me = this;
+        
+        me.clearDetail0();
+        me.clearDetail1();
+    },
+
+    /**
+     * 清空第一个从表数据
+     */
+    clearDetail0: function(f, n, o) {
+        var me = this,
+        form = me.getView(),
+        grid = form.query('detailGridField')[0];
+        me.clearDetail(grid);
+    },
+
+    /**
+     * 清空第二个从表数据
+     */
+    clearDetail1: function() {
+        var me = this,
+        form = me.getView(),
+        grid = form.query('detailGridField')[1];
+        me.clearDetail(grid);
+    },
+
+    /**
+     * 清空一个从表数据
+     */
+    clearDetail: function(grid) {
+        var datas = [],
+        emptyRows = grid.emptyRows,
+        detnoColumn = grid.detnoColumn,
+        detno = 0,
+        store = grid.getStore();
+        
+        Ext.Array.each(new Array(emptyRows), function() {
+            detno += 1;
+            var data = {};
+            data[detnoColumn] = detno;
+            datas.push(data);
+        })
+        store.removeAll();
+        store.add(datas);
+        // 不写该方法合计列会错位，这里触发afterEdit事件用来刷新grid
+        store.getAt(0) ? store.afterEdit(store.getAt(0), ['']) : null;
+    },
 });

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

@@ -46,7 +46,10 @@ Ext.define('saas.view.money.recBalance.FormPanel', {
         xtype: "customerDbfindTrigger",
         name: "rb_custname",
         fieldLabel: "客户名称",
-        allowBlank : false
+        allowBlank : false,
+        listeners: {
+            change: 'clearDetails'
+        }
     }, {
         xtype: "numberfield",
         name: "cu_leftamount",

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

@@ -263,5 +263,57 @@ Ext.define('saas.view.money.recBalance.FormPanelController', {
         main.rb_auditman = '';
         main.rb_auditdate = null;
         return formData;
-    }
+    },
+
+    /**
+     * 清空所有从表数据
+     */
+    clearDetails: function() {
+        var me = this;
+        
+        me.clearDetail0();
+        me.clearDetail1();
+    },
+
+    /**
+     * 清空第一个从表数据
+     */
+    clearDetail0: function(f, n, o) {
+        var me = this,
+        form = me.getView(),
+        grid = form.query('detailGridField')[0];
+        me.clearDetail(grid);
+    },
+
+    /**
+     * 清空第二个从表数据
+     */
+    clearDetail1: function() {
+        var me = this,
+        form = me.getView(),
+        grid = form.query('detailGridField')[1];
+        me.clearDetail(grid);
+    },
+
+    /**
+     * 清空一个从表数据
+     */
+    clearDetail: function(grid) {
+        var datas = [],
+        emptyRows = grid.emptyRows,
+        detnoColumn = grid.detnoColumn,
+        detno = 0,
+        store = grid.getStore();
+        
+        Ext.Array.each(new Array(emptyRows), function() {
+            detno += 1;
+            var data = {};
+            data[detnoColumn] = detno;
+            datas.push(data);
+        })
+        store.removeAll();
+        store.add(datas);
+        // 不写该方法合计列会错位，这里触发afterEdit事件用来刷新grid
+        store.getAt(0) ? store.afterEdit(store.getAt(0), ['']) : null;
+    },
 });

frontend/saas-web/app/view/money/report/OtherIODetail.js

@@ -10,8 +10,8 @@ Ext.define('saas.view.money.report.OtherIODetail', {
 
     viewName: 'money-report-otheriodetail',
 
-    groupField: 'bankname',
-    groupHeaderTpl: '资金账户: {[values.rows[0].data.bankname]}',
+    groupField: 'bl_bankname',
+    groupHeaderTpl: '资金账户: {[values.rows[0].data.bl_bankname]}',
     listUrl: '/api/money/report/otheriodetail',
     defaultCondition: null,
     reportTitle: '其他收支明细表',