修改采购模块和仓库模块

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

@@ -19,7 +19,7 @@
     <result column="pi_total" jdbcType="DOUBLE" property="pi_total" />
     <result column="pi_recordmanid" jdbcType="INTEGER" property="pi_recordmanid" />
     <result column="pi_recordman" jdbcType="VARCHAR" property="pi_recordman" />
-    <result column="pi_recorddate" jdbcType="TIMESTAMP" property="pi_recorddate" />
+    <result column="pi_recorddate" jdbcType="TIMESTAMP" property="createTime" />
     <result column="pi_status" jdbcType="VARCHAR" property="pi_status" />
     <result column="pi_statuscode" jdbcType="VARCHAR" property="pi_statuscode" />
     <result column="pi_printstatus" jdbcType="VARCHAR" property="pi_printstatus" />
@@ -120,7 +120,7 @@
       <if test="pi_recordman != null">
         pi_recordman,
       </if>
-      <if test="pi_recorddate != null">
+      <if test="createTime != null">
         pi_recorddate,
       </if>
       <if test="pi_status != null">
@@ -213,8 +213,8 @@
       <if test="pi_recordman != null">
         #{pi_recordman,jdbcType=VARCHAR},
       </if>
-      <if test="pi_recorddate != null">
-        #{pi_recorddate,jdbcType=TIMESTAMP},
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="pi_status != null">
         #{pi_status,jdbcType=VARCHAR},
@@ -309,8 +309,8 @@
       <if test="pi_recordman != null">
         pi_recordman = #{pi_recordman,jdbcType=VARCHAR},
       </if>
-      <if test="pi_recorddate != null">
-        pi_recorddate = #{pi_recorddate,jdbcType=TIMESTAMP},
+      <if test="createTime != null">
+        pi_recorddate = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="pi_status != null">
         pi_status = #{pi_status,jdbcType=VARCHAR},
@@ -373,7 +373,7 @@
       pi_total = #{pi_total,jdbcType=DOUBLE},
       pi_recordmanid = #{pi_recordmanid,jdbcType=INTEGER},
       pi_recordman = #{pi_recordman,jdbcType=VARCHAR},
-      pi_recorddate = #{pi_recorddate,jdbcType=TIMESTAMP},
+      pi_recorddate = #{createTime,jdbcType=TIMESTAMP},
       pi_status = #{pi_status,jdbcType=VARCHAR},
       pi_statuscode = #{pi_statuscode,jdbcType=VARCHAR},
       pi_printstatus = #{pi_printstatus,jdbcType=VARCHAR},
@@ -408,7 +408,7 @@
       pi_total = #{pi_total,jdbcType=DOUBLE},
       pi_recordmanid = #{pi_recordmanid,jdbcType=INTEGER},
       pi_recordman = #{pi_recordman,jdbcType=VARCHAR},
-      pi_recorddate = #{pi_recorddate,jdbcType=TIMESTAMP},
+      pi_recorddate = #{createTime,jdbcType=TIMESTAMP},
       pi_status = #{pi_status,jdbcType=VARCHAR},
       pi_statuscode = #{pi_statuscode,jdbcType=VARCHAR},
       pi_printstatus = #{pi_printstatus,jdbcType=VARCHAR},

applications/storage/storage-server/src/main/resources/mapper/ProdInOutMapper.xml

@@ -19,7 +19,7 @@
     <result column="pi_total" jdbcType="DOUBLE" property="pi_total" />
     <result column="pi_recordmanid" jdbcType="INTEGER" property="pi_recordmanid" />
     <result column="pi_recordman" jdbcType="VARCHAR" property="pi_recordman" />
-    <result column="pi_recorddate" jdbcType="TIMESTAMP" property="pi_recorddate" />
+    <result column="pi_recorddate" jdbcType="TIMESTAMP" property="createTime" />
     <result column="pi_status" jdbcType="VARCHAR" property="pi_status" />
     <result column="pi_statuscode" jdbcType="VARCHAR" property="pi_statuscode" />
     <result column="pi_printstatus" jdbcType="VARCHAR" property="pi_printstatus" />
@@ -120,7 +120,7 @@
       <if test="pi_recordman != null">
         pi_recordman,
       </if>
-      <if test="pi_recorddate != null">
+      <if test="createTime != null">
         pi_recorddate,
       </if>
       <if test="pi_status != null">
@@ -213,8 +213,8 @@
       <if test="pi_recordman != null">
         #{pi_recordman,jdbcType=VARCHAR},
       </if>
-      <if test="pi_recorddate != null">
-        #{pi_recorddate,jdbcType=TIMESTAMP},
+      <if test="createTime != null">
+        #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="pi_status != null">
         #{pi_status,jdbcType=VARCHAR},
@@ -309,8 +309,8 @@
       <if test="pi_recordman != null">
         pi_recordman = #{pi_recordman,jdbcType=VARCHAR},
       </if>
-      <if test="pi_recorddate != null">
-        pi_recorddate = #{pi_recorddate,jdbcType=TIMESTAMP},
+      <if test="createTime != null">
+        pi_recorddate = #{createTime,jdbcType=TIMESTAMP},
       </if>
       <if test="pi_status != null">
         pi_status = #{pi_status,jdbcType=VARCHAR},
@@ -373,7 +373,7 @@
       pi_total = #{pi_total,jdbcType=DOUBLE},
       pi_recordmanid = #{pi_recordmanid,jdbcType=INTEGER},
       pi_recordman = #{pi_recordman,jdbcType=VARCHAR},
-      pi_recorddate = #{pi_recorddate,jdbcType=TIMESTAMP},
+      pi_recorddate = #{createTime,jdbcType=TIMESTAMP},
       pi_status = #{pi_status,jdbcType=VARCHAR},
       pi_statuscode = #{pi_statuscode,jdbcType=VARCHAR},
       pi_printstatus = #{pi_printstatus,jdbcType=VARCHAR},
@@ -408,7 +408,7 @@
       pi_total = #{pi_total,jdbcType=DOUBLE},
       pi_recordmanid = #{pi_recordmanid,jdbcType=INTEGER},
       pi_recordman = #{pi_recordman,jdbcType=VARCHAR},
-      pi_recorddate = #{pi_recorddate,jdbcType=TIMESTAMP},
+      pi_recorddate = #{createTime,jdbcType=TIMESTAMP},
       pi_status = #{pi_status,jdbcType=VARCHAR},
       pi_statuscode = #{pi_statuscode,jdbcType=VARCHAR},
       pi_printstatus = #{pi_printstatus,jdbcType=VARCHAR},

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

@@ -73,6 +73,11 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
         fieldLabel : "单据金额",
         readOnly:true
     }, {
+        xtype : "textfield", 
+        name : "PU_REMARK", 
+        fieldLabel : "备注", 
+        columnWidth : 0.25
+    },{
         name : "detailGridField", 
         xtype : "detailGridField", 
         storeModel:'saas.model.purchase.Purchasedetail',
@@ -271,37 +276,27 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 width : 120.0
             }
         ]
+    }, 
+    {
+        xtype : "textfield", 
+        name : "pu_recorder", 
+        fieldLabel : "录入人", 
+        readOnly:true
     }, {
         xtype : "datefield", 
         name : "createTime", 
-        bind : "{createTime}", 
-        fieldLabel : "创建时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    }, {
-        xtype : "datefield", 
-        name : "updateTime", 
-        bind : "{updateTime}", 
-        fieldLabel : "更新时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        fieldLabel : "录入日期",
+        readOnly:true
     }, {
         xtype : "textfield", 
-        readOnly : true, 
-        editable : false, 
-        name : "pu_status", 
-        bind : "{pu_status}", 
-        fieldLabel : "单据状态", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "pu_auditman", 
+        fieldLabel : "审核人", 
+        readOnly:true
     }, {
-        xtype : "hidden", 
-        readOnly : true, 
-        editable : false, 
-        name : "pu_statuscode", 
-        bind : "{pu_statuscode}", 
-        fieldLabel : "单据状态码", 
-        allowBlank : true, 
-        columnWidth : 0.0
+        xtype : "datefield", 
+        name : "pu_auditdate", 
+        fieldLabel : "审核日期",
+        readOnly:true
     }]
+
 });

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

@@ -100,7 +100,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        xtype : "textfield", 
+        xtype : "hidden", 
         name : "pi_pucode", 
         bind : "{pi_pucode}", 
         fieldLabel : "采购单号", 
@@ -326,37 +326,28 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 }
             }
         ]
+    },{
+        xtype : "textfield", 
+        name : "pi_recordman", 
+        fieldLabel : "录入人", 
+        readOnly:true
     }, {
         xtype : "datefield", 
         name : "createTime", 
-        bind : "{createTime}", 
-        fieldLabel : "创建时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    }, {
-        xtype : "datefield", 
-        name : "updateTime", 
-        bind : "{updateTime}", 
-        fieldLabel : "更新时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        fieldLabel : "录入日期",
+        readOnly:true
     }, {
         xtype : "textfield", 
-        readOnly : true, 
-        editable : false, 
-        name : "pi_status", 
-        bind : "{pi_status}", 
-        fieldLabel : "单据状态", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "pi_auditman", 
+        fieldLabel : "审核人", 
+        readOnly:true
     }, {
-        xtype : "hidden", 
-        readOnly : true, 
-        editable : false, 
-        name : "pi_statuscode", 
-        bind : "{pi_statuscode}", 
-        fieldLabel : "单据状态码", 
-        allowBlank : true, 
-        columnWidth : 0.0
+        xtype : "datefield", 
+        name : "pi_auditdate", 
+        fieldLabel : "审核日期",
+        readOnly:true
     }]
+
+
+
 });

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

@@ -92,7 +92,7 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         allowBlank : true, 
         columnWidth : 0.25
     },{
-        xtype : "textfield", 
+        xtype : "hidden", 
         name : "pi_pucode", 
         bind : "{pi_pucode}", 
         fieldLabel : "采购单号", 
@@ -307,36 +307,24 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
             }
         ]
     }, {
-        xtype : "datefield", 
-        name : "createTime", 
-        bind : "{createTime}", 
-        fieldLabel : "创建时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        xtype : "textfield", 
+        name : "pi_recordman", 
+        fieldLabel : "录入人", 
+        readOnly:true
     }, {
         xtype : "datefield", 
-        name : "updateTime", 
-        bind : "{updateTime}", 
-        fieldLabel : "更新时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "createTime", 
+        fieldLabel : "录入日期",
+        readOnly:true
     }, {
         xtype : "textfield", 
-        readOnly : true, 
-        editable : false, 
-        name : "pi_status", 
-        bind : "{pi_status}", 
-        fieldLabel : "单据状态", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "pi_auditman", 
+        fieldLabel : "审核人", 
+        readOnly:true
     }, {
-        xtype : "hidden", 
-        readOnly : true, 
-        editable : false, 
-        name : "pi_statuscode", 
-        bind : "{pi_statuscode}", 
-        fieldLabel : "单据状态码", 
-        allowBlank : true, 
-        columnWidth : 0.0
+        xtype : "datefield", 
+        name : "pi_auditdate", 
+        fieldLabel : "审核日期",
+        readOnly:true
     }]
 });

frontend/saas-web/app/view/stock/make/FormPanel.js

@@ -30,16 +30,22 @@ Ext.define('saas.view.stock.make.FormPanel', {
         name: 'id',
         fieldLabel: 'id',
         columnWidth: 0
-    }, {
-        xtype : "textfield", 
-        name : "ma_code", 
-        fieldLabel : "制造单号",
-        columnWidth: 0.2
-    }, {
-        xtype : "textfield", 
-        name : "ma_type", 
-        fieldLabel : "类型",
-        columnWidth: 0.2
+    },{
+        xtype: 'combobox',
+        name: 'ma_type',
+        columnWidth: 0.2,
+        fieldLabel: '类型',
+        queryMode: 'local',
+        displayField: 'name',
+        valueField: 'value',
+        editable:false,
+        store: Ext.create('Ext.data.ArrayStore', {
+            fields: ['name', 'value'],
+            data: [
+                ["拆件", "拆件"],
+                ["组装", "组装"],
+            ]
+        })
     },{
         xtype: 'hidden',
         name: 'ma_prodid',
@@ -81,19 +87,29 @@ Ext.define('saas.view.stock.make.FormPanel', {
         xtype : "hidden", 
         name : "ma_whid", 
         fieldLabel : "仓库id",
-        columnWidth: 0.2
+        columnWidth: 0
     },{
         xtype : "hidden",
         name : "ma_whcode", 
         fieldLabel : "仓库编号",
-        columnWidth: 0.2
+        columnWidth: 0
     },{
         xtype : "dbfindtrigger",
         name : "ma_whname",
         fieldLabel : "仓库名称",
         columnWidth: 0.2
-        },
-        {
+    },{
+        xtype : "numberfield", 
+        name : "ma_price", 
+        fieldLabel : "单位成本",
+        columnWidth: 0.2
+    },{
+        xtype : "numberfield", 
+        name : "ma_total", 
+        fieldLabel : "总成本",
+        columnWidth: 0.2
+    },
+    {
         name : "detailGridField", 
         xtype : "detailGridField", 
         storeModel:'saas.model.stock.Makematerial',
@@ -210,16 +226,58 @@ Ext.define('saas.view.stock.make.FormPanel', {
                     valueField : "value",
                     xtype : "dbfindtrigger"
                 }
+            },{
+                text : "出库单位成本", 
+                dataIndex : "mm_price", 
+                width : 120.0,
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 8,
+                    minValue:0
+                },
+                renderer : function(v) {
+                    var arr = (v + '.').split('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
+            },            {
+                text : "出库成本", 
+                dataIndex : "mm_amount", 
+                width : 120.0, 
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 2,
+                    editable : false
+                },
+                renderer : function(v) {
+                    var arr = (v + '.').split('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                },
+                summaryType: 'sum',
+                summaryRenderer: function(v) {
+                    var arr = (v + '.').split('.');
+                    var xr = (new Array(arr[1].length)).fill('0');
+                    var format = '0,000.' + xr.join();
+                    return Ext.util.Format.number(v, format);
+                }
             },{
                 text : "替代料",
                 dataIndex : "mm_repprodcode",
                 width : 200.0,
-                hidden:true
+                editor : {
+                    xtype : "textfield"
+                },
+            
             }, {
                 text : "备注",
                 dataIndex : "mm_remark",
                 width : 250,
-                hidden:true
+                editor : {
+                    xtype : "textfield"
+                },
             }]
     },{
         xtype : "datefield", 
@@ -234,16 +292,6 @@ Ext.define('saas.view.stock.make.FormPanel', {
         fieldLabel : "制单人",
         columnWidth: 0.2
     },{
-        xtype : "numberfield", 
-        name : "ma_price", 
-        fieldLabel : "单位成本",
-        columnWidth: 0.2
-    },{
-        xtype : "numberfield", 
-        name : "ma_total", 
-        fieldLabel : "总成本",
-        columnWidth: 0.2
-    }, {
         xtype : "datefield", 
         name : "updateTime", 
         bind : "{updateTime}", 

frontend/saas-web/app/view/stock/otherIn/FormPanel.js

@@ -275,37 +275,25 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 }
             }
         ]
+    },{
+        xtype : "textfield", 
+        name : "pi_recordman", 
+        fieldLabel : "录入人", 
+        readOnly:true
     }, {
         xtype : "datefield", 
         name : "createTime", 
-        bind : "{createTime}", 
-        fieldLabel : "创建时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
-    }, {
-        xtype : "datefield", 
-        name : "updateTime", 
-        bind : "{updateTime}", 
-        fieldLabel : "更新时间", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        fieldLabel : "录入日期",
+        readOnly:true
     }, {
         xtype : "textfield", 
-        readOnly : true, 
-        editable : false, 
-        name : "pi_status", 
-        bind : "{pi_status}", 
-        fieldLabel : "单据状态", 
-        allowBlank : true, 
-        columnWidth : 0.25
+        name : "pi_auditman", 
+        fieldLabel : "审核人", 
+        readOnly:true
     }, {
-        xtype : "hidden", 
-        readOnly : true, 
-        editable : false, 
-        name : "pi_statuscode", 
-        bind : "{pi_statuscode}", 
-        fieldLabel : "单据状态码", 
-        allowBlank : true, 
-        columnWidth : 0.0
+        xtype : "datefield", 
+        name : "pi_auditdate", 
+        fieldLabel : "审核日期",
+        readOnly:true
     }]
 });

frontend/saas-web/app/view/stock/otherOut/FormPanel.js

@@ -277,37 +277,25 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 }
             }
         ]
+    },{
+        xtype : "textfield", 
+        name : "pi_recordman", 
+        fieldLabel : "录入人", 
+        readOnly:true
     }, {
-        xtype: "datefield",
-        name: "createTime",
-        bind: "{createTime}",
-        fieldLabel: "创建时间",
-        allowBlank: true,
-        columnWidth: 0.25
+        xtype : "datefield", 
+        name : "createTime", 
+        fieldLabel : "录入日期",
+        readOnly:true
     }, {
-        xtype: "datefield",
-        name: "updateTime",
-        bind: "{updateTime}",
-        fieldLabel: "更新时间",
-        allowBlank: true,
-        columnWidth: 0.25
+        xtype : "textfield", 
+        name : "pi_auditman", 
+        fieldLabel : "审核人", 
+        readOnly:true
     }, {
-        xtype: "textfield",
-        readOnly: true,
-        editable: false,
-        name: "pi_status",
-        bind: "{pi_status}",
-        fieldLabel: "单据状态",
-        allowBlank: true,
-        columnWidth: 0.25
-    }, {
-        xtype: "hidden",
-        readOnly: true,
-        editable: false,
-        name: "pi_statuscode",
-        bind: "{pi_statuscode}",
-        fieldLabel: "单据状态码",
-        allowBlank: true,
-        columnWidth: 0.0
+        xtype : "datefield", 
+        name : "pi_auditdate", 
+        fieldLabel : "审核日期",
+        readOnly:true
     }]
 });