修改其他出入库单

applications/document/document-dto/src/main/java/com.usoftchina.saas.document.dto/CustomercontactDTO.java

@@ -30,4 +30,6 @@ public class CustomercontactDTO extends CommonBaseEntity implements Serializable
 
     private String cc_text5;
 
+    private Integer cc_default;
+
 }

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/CustomerList.java

@@ -109,4 +109,5 @@ public class CustomerList extends CommonBaseEntity{
 
     private String cc_text5;
 
+    private Integer cc_default;
 }

applications/document/document-dto/src/main/java/com/usoftchina/saas/document/entities/Customercontact.java

@@ -29,4 +29,6 @@ public class Customercontact extends CommonBaseEntity implements Serializable {
 
     private String cc_text5;
 
+    private Integer cc_default;
+
 }

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

@@ -13,4 +13,6 @@ public interface CustomerMapper extends CommonBaseMapper<Customer> {
     int updateByPrimaryKeySelective(Customer record);
 
     int updateByPrimaryKey(Customer record);
+
+    String selectCodeById(Long id);
 }

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

@@ -202,7 +202,7 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
         }
 
 
-        //            baseDTO = getBaseDTOById(pu_id);
+        baseDTO = getBaseDTOById(cu_id);
         //日志记录
 //            messageLogService.save(baseDTO);
         return baseDTO;
@@ -242,4 +242,21 @@ public class CustomerServiceImpl extends CommonBaseServiceImpl<CustomerMapper, C
         }
         return list;
     }
+
+    /**
+     * @Description
+     * @Param: [id]
+     * @return: com.usoftchina.saas.commons.dto.DocBaseDTO
+     * @Author: guq
+     * @Date: 2018/10/22
+     */
+    private DocBaseDTO getBaseDTOById(Long id) {
+        if (null == id) {
+            return null;
+        }
+        String code = getMapper().selectCodeById(id);
+        DocBaseDTO baseDTO = new DocBaseDTO(id, code, "Customer");
+        return baseDTO;
+    }
+
 }

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

@@ -2,7 +2,32 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.usoftchina.saas.document.mapper.CustomerListMapper">
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.document.entities.CustomerList">
-    <id column="cc_id" jdbcType="INTEGER" property="id" />
+    <id column="cu_id" jdbcType="INTEGER" property="id" />
+    <result column="cu_code" jdbcType="VARCHAR" property="cu_code" />
+    <result column="cu_name" jdbcType="VARCHAR" property="cu_name" />
+    <result column="cu_uu" jdbcType="VARCHAR" property="cu_uu" />
+    <result column="cu_type" jdbcType="VARCHAR" property="cu_type" />
+    <result column="cu_begindate" jdbcType="TIMESTAMP" property="cu_begindate" />
+    <result column="cu_beginaramount" jdbcType="DOUBLE" property="cu_beginaramount" />
+    <result column="cu_beginprerecamount" jdbcType="DOUBLE" property="cu_beginprerecamount" />
+    <result column="cu_promisedays" jdbcType="DOUBLE" property="cu_promisedays" />
+    <result column="cu_taxrate" jdbcType="DOUBLE" property="cu_taxrate" />
+    <result column="cu_sellerid" jdbcType="INTEGER" property="cu_sellerid" />
+    <result column="cu_sellercode" jdbcType="VARCHAR" property="cu_sellercode" />
+    <result column="cu_sellername" jdbcType="VARCHAR" property="cu_sellername" />
+    <result column="cu_credit" jdbcType="DOUBLE" property="cu_credit" />
+    <result column="cu_status" jdbcType="VARCHAR" property="cu_status" />
+    <result column="cu_statuscode" jdbcType="VARCHAR" property="cu_statuscode" />
+    <result column="cu_recordmanid" jdbcType="INTEGER" property="cu_recordmanid" />
+    <result column="cu_recordman" jdbcType="VARCHAR" property="cu_recordman" />
+    <result column="cu_recorddate" jdbcType="TIMESTAMP" property="cu_recorddate" />
+    <result column="cu_leftamount" jdbcType="DOUBLE" property="cu_leftamount" />
+    <result column="cu_recamount" jdbcType="DOUBLE" property="cu_recamount" />
+    <result column="ca_cuid" jdbcType="INTEGER" property="ca_cuid" />
+    <result column="ca_detno" jdbcType="INTEGER" property="ca_detno" />
+    <result column="ca_person" jdbcType="VARCHAR" property="ca_person" />
+    <result column="ca_phone" jdbcType="INTEGER" property="ca_phone" />
+    <result column="ca_default" jdbcType="INTEGER" property="ca_default" />
     <result column="cc_cuid" jdbcType="INTEGER" property="cc_cuid" />
     <result column="cc_detno" jdbcType="INTEGER" property="cc_detno" />
     <result column="cc_name" jdbcType="VARCHAR" property="cc_name" />
@@ -20,12 +45,14 @@
     <result column="cc_tel" jdbcType="INTEGER" property="cc_tel" />
     <result column="cc_qq" jdbcType="VARCHAR" property="cc_qq" />
     <result column="cc_email" jdbcType="VARCHAR" property="cc_email" />
+    <result column="cc_default" jdbcType="INTEGER" property="cc_default" />
 
   </resultMap>
 
 
   <select id="selectCustomerListByCondition"  resultMap="BaseResultMap">
-    select  *  from customer left join customeraddress on cu_id=ca_cuid left join customercontact on cu_id = cc_cuid
+    select  *  from customer left join customeraddress on cu_id=ca_cuid and customeraddress.ca_default = 1  left join customercontact on cu_id = cc_cuid
+    and customercontact.cc_default=1
     <where>
       <if test="con != null">
         ${con}

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

@@ -39,7 +39,7 @@
     updaterid, updatetime, cu_text1, cu_text2, cu_text3, cu_text4, cu_text5, cu_leftamount, 
     cu_recamount
   </sql>
-  <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
     select 
     <include refid="Base_Column_List" />
     from customer
@@ -286,14 +286,14 @@
       <if test="cu_recorddate != null">
         cu_recorddate = #{cu_recorddate,jdbcType=TIMESTAMP},
       </if>
-      <if test="companyid != null">
-        companyid = #{companyid,jdbcType=INTEGER},
+      <if test="companyId != null">
+        companyid = #{companyId,jdbcType=INTEGER},
       </if>
-      <if test="updaterid != null">
-        updaterid = #{updaterid,jdbcType=INTEGER},
+      <if test="updaterId != null">
+        updaterid = #{updaterId,jdbcType=INTEGER},
       </if>
-      <if test="updatetime != null">
-        updatetime = #{updatetime,jdbcType=TIMESTAMP},
+      <if test="updateTime != null">
+        updatetime = #{updateTime,jdbcType=TIMESTAMP},
       </if>
       <if test="cu_text1 != null">
         cu_text1 = #{cu_text1,jdbcType=VARCHAR},
@@ -351,4 +351,12 @@
       cu_recamount = #{cu_recamount,jdbcType=DOUBLE}
     where cu_id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="selectCodeById" parameterType="java.lang.Long" resultType="string">
+    select
+    cu_code
+    from customer
+    where cu_id = #{id,jdbcType=INTEGER}
+  </select>
+
 </mapper>

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

@@ -207,7 +207,7 @@
     ,
     <include refid="Blob_Column_List" />
     from customeraddress
-    where ca_cuid = #{fk_i,jdbcType=INTEGER}
+    where ca_cuid = #{fk_i,jdbcType=INTEGER} order by ca_detno
   </select>
 
   <insert id="batchInsert" parameterType="java.util.List" >

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

@@ -17,10 +17,11 @@
     <result column="cc_text3" jdbcType="VARCHAR" property="cc_text3" />
     <result column="cc_text4" jdbcType="VARCHAR" property="cc_text4" />
     <result column="cc_text5" jdbcType="VARCHAR" property="cc_text5" />
+    <result column="cc_default" jdbcType="INTEGER" property="cc_default" />
   </resultMap>
   <sql id="Base_Column_List">
     cc_id, cc_cuid, cc_detno, cc_name, cc_tel, cc_qq, cc_email, companyid, updaterid, 
-    updatetime, cc_text1, cc_text2, cc_text3, cc_text4, cc_text5
+    updatetime, cc_text1, cc_text2, cc_text3, cc_text4, cc_text5,cc_default
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -81,6 +82,9 @@
       <if test="cc_text5 != null">
         cc_text5,
       </if>
+      <if test="cc_default != null">
+        cc_default,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
 
@@ -126,6 +130,11 @@
       <if test="cc_text5 != null">
         #{cc_text5,jdbcType=VARCHAR},
       </if>
+      <if test="cc_default != null">
+        #{cc_default,jdbcType=INTEGER},
+      </if>
+
+
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.usoftchina.saas.document.entities.Customercontact">
@@ -173,6 +182,9 @@
       <if test="cc_text5 != null">
         cc_text5 = #{cc_text5,jdbcType=VARCHAR},
       </if>
+      <if test="cc_default != null">
+        cc_default = #{cc_default,jdbcType=INTEGER},
+      </if>
     </set>
     where cc_id = #{id,jdbcType=INTEGER}
   </update>
@@ -180,7 +192,7 @@
     select
     <include refid="Base_Column_List" />
     from customercontact
-    where cc_cuid = #{fk_i,jdbcType=INTEGER}
+    where cc_cuid = #{fk_i,jdbcType=INTEGER} order by cc_detno
   </select>
 
   <insert id="batchInsert" parameterType="java.util.List" >
@@ -212,7 +224,10 @@
           updaterid,
         </if>
         <if test="item.updateTime != null">
-          updatetime
+          updatetime,
+        </if>
+        <if test="item.cc_default != null">
+          cc_default,
         </if>
       </trim>
       <trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -243,6 +258,9 @@
         <if test="item.updatetime != null">
           #{item.updateTime,jdbcType=TIMESTAMP},
         </if>
+        <if test="item.cc_default != null">
+          #{item.cc_default,jdbcType=INTEGER},
+        </if>
       </trim>
     </foreach>
   </insert>
@@ -294,10 +312,11 @@
         <if test="item.cc_text5 != null">
           cc_text5 = #{item.cc_text5,jdbcType=VARCHAR},
         </if>
+        <if test="item.cc_default != null">
+          cc_default = #{item.cc_default,jdbcType=INTEGER},
+        </if>
       </set>
       where cc_id = #{item.id,jdbcType=INTEGER}
     </foreach>
   </update>
-
-
 </mapper>

applications/storage/storage-server/src/main/java/com/usoftchina/saas/storage/mapper/ProdIODetailMapper.java

@@ -10,7 +10,6 @@ public interface ProdIODetailMapper extends CommonBaseMapper<ProdIODetail> {
 
     int deleteByPrimaryKey(Long pd_id);
 
-    int insert(ProdIODetail record);
 
     int insertSelective(ProdIODetail record);
 

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.usoftchina.saas.purchase.mapper.ProdIODetailMapper">
+<mapper namespace="com.usoftchina.saas.storage.mapper.ProdIODetailMapper">
   <resultMap id="BaseResultMap" type="com.usoftchina.saas.storage.po.ProdIODetail">
     <id column="pd_id" jdbcType="INTEGER" property="id" />
     <result column="pd_piid" jdbcType="INTEGER" property="pd_piid" />
@@ -100,37 +100,6 @@
     where pd_id = #{pd_id,jdbcType=INTEGER}
   </delete>
 
-  <insert id="insert" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
-    insert into prodiodetail (pd_id, pd_piid, pd_inoutno, 
-      pd_piclass, pd_pdno, pd_ordercode, 
-      pd_orderdetno, pd_prodid, pd_prodcode, 
-      pd_unit, pd_inqty, pd_outqty, 
-      pd_orderprice, pd_sendprice, pd_price, 
-      pd_total, pd_taxrate, pd_netprice, 
-      pd_nettotal, pd_whid, pd_whcode, 
-      pd_whname, pd_inwhid, pd_inwhcode, 
-      pd_inwhname, pd_orderid, pd_sdid, 
-      pd_status, companyid, updaterid, 
-      updatetime, pd_text1, pd_text2, 
-      pd_text3, pd_text4, pd_text5, 
-      pd_ym, pd_yqty, pd_remark,pd_ioid
-      )
-    values (#{pd_id,jdbcType=INTEGER}, #{pd_piid,jdbcType=INTEGER}, #{pd_inoutno,jdbcType=VARCHAR}, 
-      #{pd_piclass,jdbcType=VARCHAR}, #{pd_pdno,jdbcType=INTEGER}, #{pd_ordercode,jdbcType=VARCHAR}, 
-      #{pd_orderdetno,jdbcType=INTEGER}, #{pd_prodid,jdbcType=INTEGER}, #{pd_prodcode,jdbcType=VARCHAR}, 
-      #{pd_unit,jdbcType=VARCHAR}, #{pd_inqty,jdbcType=DOUBLE}, #{pd_outqty,jdbcType=DOUBLE},
-      #{pd_orderprice,jdbcType=DOUBLE}, #{pd_sendprice,jdbcType=DOUBLE}, #{pd_price,jdbcType=DOUBLE}, 
-      #{pd_total,jdbcType=DOUBLE}, #{pd_taxrate,jdbcType=DOUBLE}, #{pd_netprice,jdbcType=DOUBLE},
-      #{pd_nettotal,jdbcType=DOUBLE}, #{pd_whid,jdbcType=INTEGER}, #{pd_whcode,jdbcType=VARCHAR}, 
-      #{pd_whname,jdbcType=VARCHAR}, #{pd_inwhid,jdbcType=INTEGER}, #{pd_inwhcode,jdbcType=VARCHAR}, 
-      #{pd_inwhname,jdbcType=VARCHAR}, #{pd_orderid,jdbcType=INTEGER}, #{pd_sdid,jdbcType=INTEGER}, 
-      #{pd_status,jdbcType=INTEGER}, #{companyid,jdbcType=INTEGER}, #{updaterid,jdbcType=INTEGER}, 
-      #{updatetime,jdbcType=TIMESTAMP}, #{pd_text1,jdbcType=VARCHAR}, #{pd_text2,jdbcType=VARCHAR}, 
-      #{pd_text3,jdbcType=VARCHAR}, #{pd_text4,jdbcType=VARCHAR}, #{pd_text5,jdbcType=VARCHAR}, 
-      #{pd_ym,jdbcType=INTEGER}, #{pd_yqty,jdbcType=DOUBLE}, #{pd_remark,jdbcType=LONGVARCHAR},
-      #{pd_ioid,jdbcType=INTEGER}
-      )
-  </insert>
   <insert id="insertSelective" parameterType="com.usoftchina.saas.storage.po.ProdIODetail">
     <selectKey resultType="java.lang.Long" keyProperty="id">
       SELECT LAST_INSERT_ID() AS ID
@@ -585,7 +554,7 @@
     where pd_id = #{pd_id,jdbcType=INTEGER}
   </update>
 
-  <insert id="batchInsert" parameterType="java.util.List" >
+  <insert id="batchInsert1" parameterType="java.util.List" >
     insert into prodiodetail
     (
     pd_piid,pd_inoutno,pd_piclass,pd_pdno,pd_ordercode,
@@ -612,7 +581,7 @@
     </foreach>
   </insert>
 
-  <insert id="batchInsert1" parameterType="java.util.List" >
+  <insert id="batchInsert" parameterType="java.util.List" >
     <foreach collection="list" item="item" index="index" open="" close="" separator=",">
       insert into prodiodetail
       <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -853,7 +822,6 @@
           #{item.pd_ioid,jdbcType=INTEGER},
         </if>
       </trim>
-
     </foreach>
   </insert>
 

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

@@ -79,22 +79,22 @@
         ${con}
       </if>
       <if test="companyId != null">
-        and   prodinout.companyId = #{companyId}
+        and   prodinout.companyid = #{companyId}
       </if>
     </where>  order by pi_id,pd_pdno
   </select>
 
   <select id="selectProdInOutBycondition"  resultMap="BaseResultMap">
-    select  *  from prodinout
+    select  *  from prodinout left join prodiodetail on pi_id=pd_piid
     <where>
       <if test="con != null">
         ${con}
       </if>
       <if test="companyId != null">
-        and  companyId = #{companyId}
+        and   prodinout.companyid = #{companyId}
       </if>
     </where>
-    order by pi_id
+    order by pi_id,pd_pdno
   </select>
 
 

applications/storage/storage-server/src/test/com/usoftchina/saas/storage/mapper/ProdIODetailMapperTest.java

@@ -0,0 +1,83 @@
+package com.usoftchina.saas.storage.mapper;
+
+import com.usoftchina.saas.storage.StorageApplication;
+import com.usoftchina.saas.storage.po.ProdIODetail;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by zdw
+ * 2018-10-25 08:59.
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE, classes = StorageApplication.class)
+@EnableAutoConfiguration
+public class ProdIODetailMapperTest {
+
+    @Autowired
+    private ProdIODetailMapper prodIODetailMapper;
+
+
+
+
+
+    @Test
+    public void deleteByPrimaryKey() throws Exception {
+    }
+
+    @Test
+    public void insert() throws Exception {
+    }
+
+    @Test
+    public void insertSelective() throws Exception {
+    }
+
+    @Test
+    public void selectByPrimaryKey() throws Exception {
+    }
+
+    @Test
+    public void updateByPrimaryKeySelective() throws Exception {
+    }
+
+    @Test
+    public void updateByPrimaryKeyWithBLOBs() throws Exception {
+    }
+
+    @Test
+    public void updateByPrimaryKey() throws Exception {
+    }
+
+    @Test
+    public void batchInsert() throws Exception {
+        List<ProdIODetail> list = new ArrayList<>();
+        ProdIODetail prodIODetail = new ProdIODetail();
+        prodIODetail.setPd_piid(new Long(1));
+        prodIODetail.setPd_inoutno("insert1");
+        list.add(prodIODetail);
+
+        prodIODetailMapper.batchInsert(list);
+
+    }
+
+    @Test
+    public void batchUpdate() throws Exception {
+    }
+
+    @Test
+    public void updatePurchaseYqty() throws Exception {
+    }
+
+    @Test
+    public void selectByFK() throws Exception {
+    }
+
+}

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

@@ -104,8 +104,8 @@ Ext.define('saas.view.purchase.purchaseIn.QueryPanel', {
         codeField:'pi_inoutno',
         addTitle:'采购验收单',
         addXtype:'purchase-purchasein-formpanel',
-        defaultCondition:' pi_class = \'采购验收单\'',
-        baseVastUrl:basePath+'purchase/prodinout/',
+        defaultCondition:' pi_class = 采购验收单',
+        baseVastUrl:"http://localhost:8800/prodinout/",
         baseColumn: [{
             text: '序号',
             width: 80,

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

@@ -6,7 +6,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
     viewModel: 'stock-appropriationinout-formpanel',
     
      //字段属性
-     _title:'其它入库单',
+     _title:'调拨单',
      _idField: 'id',
      _codeField: 'pi_inoutno',
      _statusField: 'pi_status',
@@ -20,11 +20,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
      _deleteDetailUrl:'http://localhost:9000/prodinout/deleteItem/',
      initId:0,
  
-     toolBtns: [{
-         xtype: 'button',
-         text: '转其他出库',
-         handler: 'turnIn'
-     }],
+     toolBtns: [],
 
     defaultItems: [{
         xtype: 'hidden',
@@ -47,7 +43,8 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
         fieldLabel : "单据类型", 
         readOnly:true,
         allowBlank : true,
-        hidden:true, 
+        hidden:true,
+        defaultValue:"调拨单", 
         columnWidth : 0.25
     },{
         xtype : "datefield", 
@@ -120,7 +117,7 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
             },
             {
                 text : "数量", 
-                dataIndex : "pd_qty", 
+                dataIndex : "pd_inqty", 
                 editor : {
                     xtype : "numberfield"
                 },

frontend/saas-web/app/view/stock/appropriationInOut/QueryPanel.js

@@ -1,4 +1,4 @@
-Ext.define('saas.view.stock.appropriationinout.QueryPanel', {
+Ext.define('saas.view.stock.appropriationInOut.QueryPanel', {
     extend: 'saas.view.core.query.QueryPanel',
     xtype: 'stock-appropriationinout-querypanel',
 
@@ -9,22 +9,22 @@ Ext.define('saas.view.stock.appropriationinout.QueryPanel', {
 
     queryFormItems: [{
         xtype: 'hidden',
-        name: 'pu_id',
-        bind: '{pu_id}',
+        name: 'id',
+        bind: '{id}',
         fieldLabel: 'ID',
         allowBlank: true,
         columnWidth: 0
     }, {
         xtype: 'textfield',
-        name: 'pu_code',
-        bind: '{pu_code}',
+        name: 'pi_inoutno',
+        bind: '{pi_inoutno}',
         fieldLabel: '单据编号',
         allowBlank: true,
         columnWidth: 0.25
     }, {
         xtype: 'condatefield',
-        name: 'pu_date',
-        bind: '{pu_date}',
+        name: 'pi_date',
+        bind: '{pi_date}',
         fieldLabel: '采购日期',
         allowBlank: true,
         columnWidth: 0.5
@@ -112,32 +112,32 @@ Ext.define('saas.view.stock.appropriationinout.QueryPanel', {
         columnWidth: 1
     }],
     queryGridConfig: {
-        idField: 'pu_id',
-        codeField: 'pu_code',
-        addTitle: '采购单',
-        addXtype: 'purchase-purchase-formpanel',
-        defaultCondition:' pi_class = \'调拨单\'',
-        baseVastUrl: 'http://localhost:8800/purchase/',
+        idField: 'id',
+        codeField: 'pi_inoutno',
+        addTitle: '其它入库单',
+        addXtype: 'stock-appropriationinout-formpanel',
+        defaultCondition:' pi_class = \'其它入库单\'',
+        baseVastUrl: 'http://localhost:9000/prodinout/',
         baseColumn: [{
             text: '序号',
             width: 80,
             xtype: 'rownumberer'
         }, {
             text: 'id',
-            dataIndex: 'pu_id',
+            dataIndex: 'id',
             width: 100,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
-            dataIndex: 'pu_code',
+            dataIndex: 'pi_inoutno',
             width: 120
         }, {
             text: '单据状态',
-            dataIndex: 'pu_status',
+            dataIndex: 'pi_status',
             width: 120
         }, {
             text: '下单日期',
-            dataIndex: 'pu_indate',
+            dataIndex: 'pi_date',
             xtype: 'datecolumn',
             width: 200
         }, {
@@ -162,7 +162,7 @@ Ext.define('saas.view.stock.appropriationinout.QueryPanel', {
             xtype: 'rownumberer'
         }, {
             text: 'id',
-            dataIndex: 'pu_id',
+            dataIndex: 'id',
             width: 100,
             xtype: 'numbercolumn'
         }, {

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

@@ -46,9 +46,9 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
         name : "pi_class", 
         bind : "{pi_class}", 
         fieldLabel : "单据类型", 
-        readOnly:true,
+        readOnly:false,
         allowBlank : true,
-        hidden:true, 
+        defaultValue:"其它入库单",
         columnWidth : 0.25
     },{
         xtype : "hidden", 
@@ -109,7 +109,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
                 hidden:true
             },{
                 text : "pd_piid", 
-                dataIndex : "id", 
+                dataIndex : "pd_piid", 
                 xtype : "numbercolumn",
                 hidden:true
             },
@@ -150,7 +150,7 @@ Ext.define('saas.view.stock.otherIn.FormPanel', {
             },
             {
                 text : "数量", 
-                dataIndex : "pd_qty", 
+                dataIndex : "pd_inqty", 
                 editor : {
                     xtype : "numberfield"
                 },

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

@@ -9,22 +9,22 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
 
     queryFormItems: [{
         xtype: 'hidden',
-        name: 'pu_id',
-        bind: '{pu_id}',
+        name: 'id',
+        bind: '{id}',
         fieldLabel: 'ID',
         allowBlank: true,
         columnWidth: 0
     }, {
         xtype: 'textfield',
-        name: 'pu_code',
-        bind: '{pu_code}',
+        name: 'pi_inoutno',
+        bind: '{pi_inoutno}',
         fieldLabel: '单据编号',
         allowBlank: true,
         columnWidth: 0.25
     }, {
         xtype: 'condatefield',
-        name: 'pu_date',
-        bind: '{pu_date}',
+        name: 'pi_date',
+        bind: '{pi_date}',
         fieldLabel: '采购日期',
         allowBlank: true,
         columnWidth: 0.5
@@ -112,8 +112,8 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
         columnWidth: 1
     }],
     queryGridConfig: {
-        idField: 'pu_id',
-        codeField: 'pu_code',
+        idField: 'id',
+        codeField: 'pi_inoutno',
         addTitle: '其它入库单',
         addXtype: 'stock-otherin-formpanel',
         defaultCondition:' pi_class = \'其它入库单\'',
@@ -124,20 +124,20 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             xtype: 'rownumberer'
         }, {
             text: 'id',
-            dataIndex: 'pu_id',
+            dataIndex: 'id',
             width: 100,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
-            dataIndex: 'pu_code',
+            dataIndex: 'pi_inoutno',
             width: 120
         }, {
             text: '单据状态',
-            dataIndex: 'pu_status',
+            dataIndex: 'pi_status',
             width: 120
         }, {
             text: '下单日期',
-            dataIndex: 'pu_indate',
+            dataIndex: 'pi_date',
             xtype: 'datecolumn',
             width: 200
         }, {
@@ -162,7 +162,7 @@ Ext.define('saas.view.stock.otherIn.QueryPanel', {
             xtype: 'rownumberer'
         }, {
             text: 'id',
-            dataIndex: 'pu_id',
+            dataIndex: 'id',
             width: 100,
             xtype: 'numbercolumn'
         }, {

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

@@ -13,12 +13,12 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
      _statusCodeField: 'pi_statuscode',
      
      _relationColumn: 'pd_piid',
-     _readUrl:'http://localhost:8800/purchase/read/',
-     _saveUrl:'http://localhost:8800/purchase/save',
-     _auditUrl:'http://localhost:8800/purchase/audit',
-     _deleteUrl:'http://localhost:8800/purchase/delete/',
-     _deleteDetailUrl:'http://localhost:8800/purchase/deleteItem/',
-     _turnInUrl:'http://localhost:8800/purchase/turnProdin/',
+     _readUrl:'http://localhost:9000/prodinout/read/',
+     _saveUrl:'http://localhost:9000/prodinout/save',
+     _auditUrl:'http://localhost:9000/prodinout/audit',
+     _deleteUrl:'http://localhost:9000/prodinout/delete/',
+     _deleteDetailUrl:'http://localhost:9000/prodinout/deleteItem/',
+     _turnInUrl:'http://localhost:9000/prodinout/turnProdin/',
      initId:0,
  
      toolBtns: [],
@@ -45,6 +45,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
         readOnly:true,
         allowBlank : true,
         hidden:true, 
+        defaultValue:"其它出库单",
         columnWidth : 0.25
     },{
         xtype : "hidden", 
@@ -105,7 +106,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
                 hidden:true
             },{
                 text : "pd_piid", 
-                dataIndex : "id", 
+                dataIndex : "pd_piid", 
                 xtype : "numbercolumn",
                 hidden:true
             },
@@ -146,7 +147,7 @@ Ext.define('saas.view.stock.otherOut.FormPanel', {
             },
             {
                 text : "数量", 
-                dataIndex : "pd_qty", 
+                dataIndex : "pd_outqty", 
                 editor : {
                     xtype : "numberfield"
                 },

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

@@ -9,22 +9,22 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
 
     queryFormItems: [{
         xtype: 'hidden',
-        name: 'pu_id',
-        bind: '{pu_id}',
+        name: 'id',
+        bind: '{id}',
         fieldLabel: 'ID',
         allowBlank: true,
         columnWidth: 0
     }, {
         xtype: 'textfield',
-        name: 'pu_code',
-        bind: '{pu_code}',
+        name: 'pi_inoutno',
+        bind: '{pi_inoutno}',
         fieldLabel: '单据编号',
         allowBlank: true,
         columnWidth: 0.25
     }, {
         xtype: 'condatefield',
-        name: 'pu_date',
-        bind: '{pu_date}',
+        name: 'pi_date',
+        bind: '{pi_date}',
         fieldLabel: '采购日期',
         allowBlank: true,
         columnWidth: 0.5
@@ -112,32 +112,32 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
         columnWidth: 1
     }],
     queryGridConfig: {
-        idField: 'pu_id',
-        codeField: 'pu_code',
-        addTitle: '其它出库单',
-        addXtype: 'stock-otheron-formpanel',
-        defaultCondition:' pi_class = \'其它出库单\'',
-        baseVastUrl: 'http://localhost:8800/purchase/',
+        idField: 'id',
+        codeField: 'pi_inoutno',
+        addTitle: '其它入库单',
+        addXtype: 'stock-otherout-formpanel',
+        defaultCondition:' pi_class = \'其它入库单\'',
+        baseVastUrl: 'http://localhost:9000/prodinout/',
         baseColumn: [{
             text: '序号',
             width: 80,
             xtype: 'rownumberer'
         }, {
             text: 'id',
-            dataIndex: 'pu_id',
+            dataIndex: 'id',
             width: 100,
             xtype: 'numbercolumn'
         }, {
             text: '单据编号',
-            dataIndex: 'pu_code',
+            dataIndex: 'pi_inoutno',
             width: 120
         }, {
             text: '单据状态',
-            dataIndex: 'pu_status',
+            dataIndex: 'pi_status',
             width: 120
         }, {
             text: '下单日期',
-            dataIndex: 'pu_indate',
+            dataIndex: 'pi_date',
             xtype: 'datecolumn',
             width: 200
         }, {
@@ -162,7 +162,7 @@ Ext.define('saas.view.stock.otherOut.QueryPanel', {
             xtype: 'rownumberer'
         }, {
             text: 'id',
-            dataIndex: 'pu_id',
+            dataIndex: 'id',
             width: 100,
             xtype: 'numbercolumn'
         }, {