去除pi_inid

applications/purchase/purchase-dto/src/main/java/com/usoftchina/saas/purchase/dto/ProdInOutDTO.java

@@ -69,7 +69,6 @@ public class ProdInOutDTO extends CommonBaseEntity implements Serializable {
 
     private String pi_address;
 
-    private Long pi_inid;
 
 
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOut.java

@@ -62,6 +62,4 @@ public class ProdInOut extends CommonBaseEntity implements Serializable {
 
     private String pi_address;
 
-    private Long pi_inid;
-
 }

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/po/ProdInOutList.java

@@ -66,8 +66,6 @@ public class ProdInOutList extends CommonBaseEntity{
 
     private String pi_address;
 
-    private Long pi_inid;
-
     private Long pd_piid;
 
     private String pd_inoutno;

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/service/impl/ProdInOutServiceImpl.java

@@ -304,8 +304,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         targetPi.setPi_vendname(sourcePi.getPi_vendname());
         targetPi.setPi_puid(sourcePi.getPi_puid());
         targetPi.setPi_pucode(sourcePi.getPi_pucode());
-        targetPi.setPi_inid(sourcePi.getId());
-
         //设置公司id
         targetPi.setCompanyId(sourcePi.getCompanyId());
         //保存数据

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

@@ -30,7 +30,6 @@
     <result column="pi_text4" jdbcType="VARCHAR" property="pi_text4" />
     <result column="pi_text5" jdbcType="VARCHAR" property="pi_text5" />
     <result column="pi_address" jdbcType="VARCHAR" property="pi_address" />
-    <result column="pi_inid" jdbcType="INTEGER" property="pi_inid" />
     <result column="pd_piid" jdbcType="INTEGER" property="pd_piid" />
     <result column="pd_inoutno" jdbcType="VARCHAR" property="pd_inoutno" />
     <result column="pd_piclass" jdbcType="VARCHAR" property="pd_piclass" />

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

@@ -32,7 +32,7 @@
     <result column="pi_text3" jdbcType="VARCHAR" property="pi_text3" />
     <result column="pi_text4" jdbcType="VARCHAR" property="pi_text4" />
     <result column="pi_text5" jdbcType="VARCHAR" property="pi_text5" />
-    <result column="pi_inid" jdbcType="INTEGER" property="pi_inid" />
+
 
 
   </resultMap>
@@ -101,7 +101,7 @@
     pi_id, pi_inoutno, pi_class, pi_date, pi_vendid, pi_vendcode, pi_vendname, pi_custid, 
     pi_custcode, pi_custname, pi_puid, pi_pucode, pi_said, pi_sacode, pi_total, pi_recordmanid, 
     pi_recordman, pi_recorddate, pi_status, pi_statuscode, pi_printstatus, pi_printstatuscode, 
-    companyid, updaterid, updatetime, pi_text1, pi_text2, pi_text3, pi_text4, pi_text5,pi_inid
+    companyid, updaterid, updatetime, pi_text1, pi_text2, pi_text3, pi_text4, pi_text5
   </sql>
   <sql id="Blob_Column_List">
     pi_address
@@ -165,7 +165,7 @@
       pi_printstatuscode, companyid, updaterid, 
       updatetime, pi_text1, pi_text2, 
       pi_text3, pi_text4, pi_text5,
-      pi_address,pi_inid)
+      pi_address)
     values (#{pi_id,jdbcType=INTEGER}, #{pi_inoutno,jdbcType=VARCHAR}, #{pi_class,jdbcType=VARCHAR}, 
       #{pi_date,jdbcType=TIMESTAMP}, #{pi_vendid,jdbcType=INTEGER}, #{pi_vendcode,jdbcType=VARCHAR}, 
       #{pi_vendname,jdbcType=VARCHAR}, #{pi_custid,jdbcType=INTEGER}, #{pi_custcode,jdbcType=VARCHAR}, 
@@ -176,7 +176,7 @@
       #{pi_printstatuscode,jdbcType=VARCHAR}, #{companyid,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, 
       #{updatetime,jdbcType=TIMESTAMP}, #{pi_text1,jdbcType=VARCHAR}, #{pi_text2,jdbcType=VARCHAR}, 
       #{pi_text3,jdbcType=VARCHAR}, #{pi_text4,jdbcType=VARCHAR}, #{pi_text5,jdbcType=VARCHAR}, 
-      #{pi_address,jdbcType=LONGVARCHAR}.#{pi_inid,jdbcType=INTEGER})
+      #{pi_address,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.purchase.po.ProdInOut">
     <selectKey resultType="java.lang.Long" keyProperty="id">
@@ -275,9 +275,6 @@
       <if test="pi_address != null">
         pi_address,
       </if>
-      <if test="pi_inid != null">
-        pi_inid,
-      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -371,11 +368,6 @@
       <if test="pi_address != null">
         #{pi_address,jdbcType=LONGVARCHAR},
       </if>
-      <if test="pi_inid != null">
-        #{pi_inid,jdbcType=INTEGER},
-      </if>
-
-
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.usoftchina.saas.purchase.po.ProdInOutExample" resultType="java.lang.Long">
@@ -480,9 +472,6 @@
       <if test="record.pi_address != null">
         pi_address = #{record.pi_address,jdbcType=LONGVARCHAR},
       </if>
-      <if test="record.pi_inid != null">
-        pi_address = #{record.pi_inid,jdbcType=INTEGER},
-      </if>
 
     </set>
     <if test="_parameter != null">
@@ -521,10 +510,7 @@
       pi_text3 = #{record.pi_text3,jdbcType=VARCHAR},
       pi_text4 = #{record.pi_text4,jdbcType=VARCHAR},
       pi_text5 = #{record.pi_text5,jdbcType=VARCHAR},
-      pi_address = #{record.pi_address,jdbcType=LONGVARCHAR},
-      pi_inid = #{record.pi_inid,jdbcType=INTEGER}
-
-
+      pi_address = #{record.pi_address,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -560,9 +546,7 @@
       pi_text2 = #{record.pi_text2,jdbcType=VARCHAR},
       pi_text3 = #{record.pi_text3,jdbcType=VARCHAR},
       pi_text4 = #{record.pi_text4,jdbcType=VARCHAR},
-      pi_text5 = #{record.pi_text5,jdbcType=VARCHAR},
-      pi_inid = #{record.pi_inid,jdbcType=INTEGER}
-
+      pi_text5 = #{record.pi_text5,jdbcType=VARCHAR}
 
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -661,10 +645,6 @@
       <if test="pi_address != null">
         pi_address = #{pi_address,jdbcType=LONGVARCHAR},
       </if>
-      <if test="pi_inid != null">
-        pi_inid = #{pi_inid,jdbcType=INTEGER},
-      </if>
-
 
     </set>
     where pi_id = #{id,jdbcType=INTEGER}
@@ -700,8 +680,7 @@
       pi_text3 = #{pi_text3,jdbcType=VARCHAR},
       pi_text4 = #{pi_text4,jdbcType=VARCHAR},
       pi_text5 = #{pi_text5,jdbcType=VARCHAR},
-      pi_address = #{pi_address,jdbcType=LONGVARCHAR},
-      pi_inid = #{pi_inid,jdbcType=INTEGER}
+      pi_address = #{pi_address,jdbcType=LONGVARCHAR}
 
     where pi_id = #{pi_id,jdbcType=INTEGER}
   </update>
@@ -735,8 +714,7 @@
       pi_text2 = #{pi_text2,jdbcType=VARCHAR},
       pi_text3 = #{pi_text3,jdbcType=VARCHAR},
       pi_text4 = #{pi_text4,jdbcType=VARCHAR},
-      pi_text5 = #{pi_text5,jdbcType=VARCHAR},
-      pi_inid = #{pi_inid,jdbcType=INTEGER}
+      pi_text5 = #{pi_text5,jdbcType=VARCHAR}
     where pi_id = #{id,jdbcType=INTEGER}
   </update>
 </mapper>

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

@@ -75,8 +75,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormController', {
                             from:'pr_detail',to:'pr_detail'
                         },{
                             from:'pr_unit',to:'pd_unit'
-                        }
-                    ],
+                        }],
                         dbtpls:[{
                             field:'pr_code',width:100
                         },{

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

@@ -102,7 +102,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
         columnWidth : 0.25
     }, {
         name : "detailGridField", 
-        xtype : "detailGridField", 
+        xtype : "detailGridField",
+        storeModel:'saas.model.purchase.prodIODetail', 
         columns : [
             {
                 text : "序号", 
@@ -148,13 +149,19 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
             {
                 text : "名称", 
                 dataIndex : "pr_detail",
-                ignore:true
+                ignore:true,
+                renderer: function (v, m, r) {
+                    return r.data["product"]?r.data["product"][m.column.dataIndex]:'';
+                }
             },
             {
                 text : "规格", 
                 dataIndex : "pr_spec",
-                ignore:true
-            }, 
+                ignore:true,
+                renderer: function (v, m, r) {
+                    return r.data["product"]?r.data["product"][m.column.dataIndex]:'';
+                }
+            },
             {
                 text : "数量", 
                 dataIndex : "pd_inqty", 

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

@@ -68,7 +68,12 @@ Ext.define('saas.view.purchase.purchaseOut.FormController', {
                         conditionCode:'pr_code',
                         dataUrl:'http://192.168.253.41:9480/api/document/product/getProductsByCondition',
                         dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode',
+                            from:'pr_id',to:'pd_prodid'                          
+                        },{
+                            from:'pr_code',to:'pd_prodcode'                          
+                        },{
+                            from:'pr_detail',to:'pr_detail'
+                        },{
                             from:'pr_unit',to:'pd_unit'
                         }],
                         dbtpls:[{

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

@@ -94,13 +94,6 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
         fieldLabel : "采购单号", 
         allowBlank : true, 
         columnWidth : 0.25
-    }, {
-        xtype : "hidden", 
-        name : "pi_inid", 
-        bind : "{pi_inid}", 
-        fieldLabel : "出入库单id", 
-        allowBlank : true, 
-        columnWidth : 0.25
     },{
         name : "detailGridField", 
         xtype : "detailGridField",