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

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

@@ -123,16 +123,18 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
             if (productDetailList.size() > 0){
                 //找到原始单据,反过账并删除
                 String inoutCode = getMapper().selectProdIOCode(product.getPr_code(), BaseContextHolder.getCompanyId(), "库存初始化");
-                post(inoutCode, "反过账");
-                getMapper().deleteProdIODetailByCode(inoutCode, BaseContextHolder.getCompanyId());
-                getMapper().deleteProdIOByCode(inoutCode, BaseContextHolder.getCompanyId());
-
+                if (!StringUtils.isEmpty(inoutCode)) {
+                    post(inoutCode, "反过账");
+                    getMapper().deleteProdIODetailByCode(inoutCode, BaseContextHolder.getCompanyId());
+                    getMapper().deleteProdIOByCode(inoutCode, BaseContextHolder.getCompanyId());
+                }
                 //此种情况不可能发生明细行数量,只会发生明细行数据修改/新增明细行
                 //a.更新明细行数据
                 List<ProductDetail> insertItems = new ArrayList<ProductDetail>();
                 List<ProductDetail> updateItems = new ArrayList<ProductDetail>();
                 for(ProductDetail productDetail : productDetailList){
                     if (productDetail.getId() == 0){
+                        productDetail.setPd_prodid(product.getId());
                         productDetail.setUpdaterId(userId);
                         productDetail.setUpdateTime(new Date());
                         insertItems.add(productDetail);
@@ -373,8 +375,8 @@ public class ProductServiceImpl extends CommonBaseServiceImpl<ProductMapper, Pro
         validEnableDel(id);
 
         String code = getMapper().getCodeById(id);
-        getMapper().deleteByPrimaryKey(id);
         productDetailMapper.deleteByProdId(id);
+        getMapper().deleteByPrimaryKey(id);
         DocBaseDTO docBaseDTO = generateMsgObj(id, code);
         //记录LOG
         messageLogService.delete(docBaseDTO);

applications/purchase/purchase-server/src/main/resources/mapper/PurchaseMapper.xml

@@ -110,9 +110,6 @@
       <if test="pu_totalupper != null" >
         PU_TOTALUPPER,
       </if>
-      <if test="createTime != null" >
-        PU_INDATE,
-      </if>
       <if test="pu_printstatus != null" >
         PU_PRINTSTATUS,
       </if>
@@ -144,13 +141,13 @@
         updateTime,
       </if>
       <if test="creatorId != null" >
-      creatorId,
+        creatorId,
       </if>
       <if test="creatorName != null" >
         creatorName,
       </if>
       <if test="createTime != null" >
-      createTime,
+        createTime,
       </if>
       <if test="pu_text1 != null" >
         pu_text1,
@@ -211,9 +208,6 @@
       <if test="pu_totalupper != null" >
         #{pu_totalupper,jdbcType=VARCHAR},
       </if>
-      <if test="createTime != null" >
-        #{createTime,jdbcType=TIMESTAMP},
-      </if>
       <if test="pu_printstatus != null" >
         #{pu_printstatus,jdbcType=VARCHAR},
       </if>
@@ -246,26 +240,27 @@
       </if>
       <if test="creatorId != null" >
        #{creatorId,jdbcType=INTEGER},
-      </if><if test="createTime != null" >
-       #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="creatorName != null" >
-       #{creatorName,jdbcType=VARCHAR},
+        #{creatorName,jdbcType=VARCHAR},
+      </if>
+      <if test="createTime != null" >
+       #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="pu_text1 != null" >
         #{pu_text1,jdbcType=VARCHAR},
       </if>
       <if test="pu_text2 != null" >
-        #{pu_text1,jdbcType=VARCHAR},
+        #{pu_text2,jdbcType=VARCHAR},
       </if>
       <if test="pu_text3 != null" >
-        #{pu_text1,jdbcType=VARCHAR},
+        #{pu_text3,jdbcType=VARCHAR},
       </if>
       <if test="pu_text4 != null" >
-        #{pu_text1,jdbcType=VARCHAR},
+        #{pu_text4,jdbcType=VARCHAR},
       </if>
       <if test="pu_text5 != null" >
-        #{pu_text1,jdbcType=VARCHAR},
+        #{pu_text5,jdbcType=VARCHAR},
       </if>
       <if test="pu_shipaddresscode != null" >
         #{pu_shipaddresscode,jdbcType=LONGVARCHAR},

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

@@ -139,15 +139,8 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                     return Ext.util.Format.number(v, format);
                 }
             }, {
-                text : "结算方式号", 
-                dataIndex : "ftd_paycode", 
-                width : 110,
-                editor:{
-                    xtype: ''  
-                }
-            }, {
-                text : "结算方式", 
-                width : 150.0, 
+                text : "结算方式",
+                width : 150.0,
                 dataIndex : "ftd_paymethod",
                 editor : {
                     xtype:'combo',
@@ -167,7 +160,15 @@ Ext.define('saas.view.money.fundtransfer.FormPanel', {
                         ]
                     })
                 }
-            }, {
+            },
+             {
+                text : "结算号",
+                dataIndex : "ftd_paycode",
+                width : 110,
+                editor:{
+                    xtype: ''
+                }
+            },{
                 text : "备注", 
                 dataIndex : "ftd_remark",
                 width : 120.0, 

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

@@ -25,14 +25,22 @@ Ext.define('saas.view.money.fundtransfer.QueryPanel', {
         fieldLabel : "单据日期",
         columnWidth: 0.5
     },{
-        xtype: 'multicombo',
+        xtype: 'combobox',
         name: 'ft_statuscode',
         fieldLabel: '审核状态',
-        datas: [
+        queryMode: 'local',
+        displayField: 'ft_status',
+        valueField: 'ft_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['ft_statuscode', 'ft_status'],
+        data: [
             ["ALL", "全部"],
             ["AUDITED", "已审核"],
             ["UNAUDITED", "未审核"]
-        ],
+        ]
+        }),
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

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

@@ -47,15 +47,23 @@ Ext.define('saas.view.money.othreceipts.QueryPanel', {
         fieldLabel: '单据日期',
         columnWidth: 0.5,
         operation: 'between'
-    }, {
-        xtype: 'multicombo',
+    },{
+        xtype: 'combobox',
         name: 'or_statuscode',
         fieldLabel: '审核状态',
-        datas: [
+        queryMode: 'local',
+        displayField: 'or_status',
+        valueField: 'or_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['or_statuscode', 'or_status'],
+        data: [
             ["ALL", "全部"],
             ["AUDITED", "已审核"],
             ["UNAUDITED", "未审核"]
-        ],
+        ]
+        }),
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

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

@@ -47,14 +47,22 @@ Ext.define('saas.view.money.othspendings.QueryPanel', {
         columnWidth: 0.5,
         fieldLabel: '单据日期'
     },{
-        xtype: 'multicombo',
+        xtype: 'combobox',
         name: 'os_statuscode',
         fieldLabel: '审核状态',
-        datas: [
+        queryMode: 'local',
+        displayField: 'os_status',
+        valueField: 'os_statuscode',
+        emptyText :'全部',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+        fields: ['os_statuscode', 'os_status'],
+        data: [
             ["ALL", "全部"],
             ["AUDITED", "已审核"],
             ["UNAUDITED", "未审核"]
-        ],
+        ]
+        }),
         getCondition: function(value) {
             if(value == 'ALL') {
                 return '1=1';

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

@@ -66,7 +66,7 @@ Ext.define('saas.view.money.report.VendorCheck', {
             dataIndex: 'pr_spec'
         }, {
             text: '单位',
-            dataIndex: 'pd_unit'
+            dataIndex: 'pr_unit'
         }, {
             text: '采购数量',
             xtype: 'numbercolumn',

frontend/saas-web/app/view/purchase/purchase/FormPanel.js

@@ -56,6 +56,7 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         name : "pu_delivery", 
         fieldLabel : "交货日期",
         allowBlank:false,
+        defaultValue: new Date(),
         columnWidth : 0.25,
     },{
         name : "pu_shipaddresscode",