修改bug

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

@@ -5,6 +5,7 @@ import com.usoftchina.saas.document.dto.ProductDTO;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @author yingp
@@ -37,7 +38,7 @@ public class PurchaseDetailDTO extends CommonBaseDTO implements Serializable{
 
     private Double pd_acceptqty;
 
-    private Double pd_delivery;
+    private Date pd_delivery;
 
     private String pd_salecode;
 

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

@@ -94,7 +94,7 @@ public class PurchaseListDTO extends CommonBaseDTO implements Serializable {
 
     private Double pd_acceptqty;
 
-    private Double pd_delivery;
+    private Date pd_delivery;
 
     private String pd_salecode;
 

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/PurchaseMapper.java

@@ -10,9 +10,6 @@ import java.util.List;
 
 public interface PurchaseMapper extends CommonBaseMapper<Purchase>{
 
-
-    int insert(Purchase record);
-
     int insertSelective(Purchase record);
 
     Purchase selectByPrimaryKey(Long id);

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/mapper/PurchasedetailMapper.java

@@ -9,8 +9,6 @@ import java.util.List;
 public interface PurchasedetailMapper extends CommonBaseMapper<Purchase> {
     int deleteByPrimaryKey(Integer pdId);
 
-    int insert(PurchaseDetail record);
-
     int insertSelective(PurchaseDetail record);
 
     PurchaseDetail selectByPrimaryKey(Integer pdId);

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

@@ -5,6 +5,7 @@ import com.usoftchina.saas.document.dto.ProductDTO;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 @Data
 public class PurchaseDetail extends CommonBaseEntity implements Serializable {
@@ -33,7 +34,7 @@ public class PurchaseDetail extends CommonBaseEntity implements Serializable {
 
     private Double pd_acceptqty;
 
-    private Double pd_delivery;
+    private Date pd_delivery;
 
     private String pd_salecode;
 

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

@@ -95,7 +95,7 @@ public class PurchaseList extends CommonBaseEntity implements Serializable {
 
     private Double pd_acceptqty;
 
-    private Double pd_delivery;
+    private Date pd_delivery;
 
     private String pd_salecode;
 

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

@@ -43,7 +43,7 @@
         <result column="PD_TOTAL" property="pd_total" jdbcType="DOUBLE" />
         <result column="PD_TAXTOTAL" property="pd_taxtotal" jdbcType="DOUBLE" />
         <result column="PD_ACCEPTQTY" property="pd_acceptqty" jdbcType="DOUBLE" />
-        <result column="PD_DELIVERY" property="pd_delivery" jdbcType="DOUBLE" />
+        <result column="PD_DELIVERY" property="pd_delivery" jdbcType="TIMESTAMP" />
         <result column="PD_SALECODE" property="pd_salecode" jdbcType="VARCHAR" />
         <result column="PD_SALEDETNO" property="pd_saledetno" jdbcType="INTEGER" />
         <result column="PD_SDID" property="pd_sdid" jdbcType="INTEGER" />
@@ -80,64 +80,5 @@
         </where>
         order by pu_id
     </select>
-    <insert id="batchInsert" parameterType="java.util.List" >
-        insert into purchasedetail ( PD_PUID, PD_CODE,
-        PD_DETNO, PD_PRODID, PD_PRODCODE,
-        PD_UNIT, PD_QTY, PD_PRICE,
-        PD_TOTAL, PD_TAXTOTAL, PD_ACCEPTQTY,
-        PD_DELIVERY, PD_SALECODE, PD_SALEDETNO,
-        PD_SDID, companyId, updaterId,
-        updateTime, pd_text1, pd_text2,
-        pd_text3, pd_text4, pd_text5,
-        pd_yqty)
-        values
-        <foreach collection="list" item="item" index="index" open="" close="" separator=",">
-            (
-            #{item.pdPuid,jdbcType=INTEGER}, #{item.pdCode,jdbcType=VARCHAR},
-            #{item.pdDetno,jdbcType=INTEGER}, #{item.pdProdid,jdbcType=INTEGER}, #{item.pdProdcode,jdbcType=VARCHAR},
-            #{item.pdUnit,jdbcType=VARCHAR}, #{item.pdQty,jdbcType=DOUBLE}, #{item.pdPrice,jdbcType=DOUBLE},
-            #{item.pdTotal,jdbcType=DOUBLE}, #{item.pdTaxtotal,jdbcType=DOUBLE}, #{item.pdAcceptqty,jdbcType=DOUBLE},
-            #{item.pdDelivery,jdbcType=DOUBLE}, #{item.pdSalecode,jdbcType=VARCHAR}, #{item.pdSaledetno,jdbcType=INTEGER},
-            #{item.pdSdid,jdbcType=INTEGER}, #{item.companyId,jdbcType=INTEGER}, #{item.updaterId,jdbcType=INTEGER},
-            #{item.updateTime,jdbcType=TIMESTAMP}, #{item.pdText1,jdbcType=VARCHAR}, #{item.pdText2,jdbcType=VARCHAR},
-            #{item.pdText3,jdbcType=VARCHAR}, #{item.pdText4,jdbcType=VARCHAR}, #{item.pdText5,jdbcType=VARCHAR},
-            #{item.pdYqty,jdbcType=DOUBLE}
-            )
-        </foreach>
-    </insert>
-    <update id="batchUpdate" parameterType="com.usoftchina.saas.purchase.po.PurchaseDetail" >
-        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
-            update purchasedetail <set>
-            PD_PUID = #{item.pdPuid},
-            PD_CODE = #{item.pdCode},
-            PD_DETNO = #{item.pdDetno},
-            PD_PRODID = #{item.pdProdid},
-            PD_PRODCODE = #{item.pdProdcode},
-            PD_UNIT = #{item.pdUnit},
-            PD_QTY = #{item.pdQty},
-            PD_PRICE = #{item.pdPrice},
-            PD_TOTAL = #{item.pdTotal},
-            PD_TAXTOTAL = #{item.pdTaxtotal},
-            PD_ACCEPTQTY = #{item.pdAcceptqty},
-            PD_DELIVERY = #{item.pdDelivery},
-            PD_SALECODE = #{item.pdSalecode},
-            PD_SALEDETNO = #{item.pdSaledetno},
-            PD_SDID = #{item.pdSdid},
-            companyId = #{item.companyId},
-            updaterId = #{item.updaterId},
-            updateTime = #{item.updateTime},
-            pd_text1 = #{item.pdText1},
-            pd_text2 = #{item.pdText2},
-            pd_text3 = #{item.pdText3},
-            pd_text4 = #{item.pdText4},
-            pd_text5 = #{item.pdText5},
-            pd_yqty = #{item.pdYqty}
-        </set>
-            where PD_ID = #{item.id,jdbcType=INTEGER}
-        </foreach>
-    </update>
-    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long" >
-        delete from purchasedetail
-        where PD_ID = #{id}
-    </delete>
+
 </mapper>

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

@@ -15,7 +15,7 @@
     <result column="PD_TAXRATE" property="pd_taxrate" jdbcType="DOUBLE" />
     <result column="PD_TAXTOTAL" property="pd_taxtotal" jdbcType="DOUBLE" />
     <result column="PD_ACCEPTQTY" property="pd_acceptqty" jdbcType="DOUBLE" />
-    <result column="PD_DELIVERY" property="pd_delivery" jdbcType="DOUBLE" />
+    <result column="PD_DELIVERY" property="pd_delivery" jdbcType="TIMESTAMP" />
     <result column="PD_SALECODE" property="pd_salecode" jdbcType="VARCHAR" />
     <result column="PD_SALEDETNO" property="pd_saledetno" jdbcType="INTEGER" />
     <result column="PD_SDID" property="pd_sdid" jdbcType="INTEGER" />
@@ -212,7 +212,7 @@
         #{pdAcceptqty,jdbcType=DOUBLE},
       </if>
       <if test="pdDelivery != null" >
-        #{pdDelivery,jdbcType=DOUBLE},
+        #{pdDelivery,jdbcType=TIMESTAMP},
       </if>
       <if test="pdSalecode != null" >
         #{pdSalecode,jdbcType=VARCHAR},

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

@@ -83,9 +83,13 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         dataUrl: '/api/document/product/list',
                         //放大镜赋值设置
                         dbfinds:[{
-                            from:'pr_code',to:'pd_prodcode'
+                            from:'id',to:'pd_prodid'                          
                         },{
-                            from:'pr_unit',to:'pd_unit'
+                            from:'pr_code',to:'pd_prodcode'                          
+                        },{
+                            from:'pr_detail',to:'pr_detail'
+                        },{
+                            from:'pr_spec',to:'pr_spec'
                         }],
                         //联想查询条件
                         dbCondition:"CONCAT(pr_code, pr_detail) like '{0}%'",
@@ -108,7 +112,7 @@ Ext.define('saas.view.purchase.purchase.FormPanelController', {
                         dbColumns:[{
                             "text": "物料ID",
                             "flex": 0,
-                            "dataIndex": "pr_id",
+                            "dataIndex": "id",
                             "width": 0,
                             "xtype": "",
                             "items": null

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

@@ -95,7 +95,7 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanelController', {
                         dbColumns:[{
                             "text": "物料ID",
                             "flex": 0,
-                            "dataIndex": "pr_id",
+                            "dataIndex": "id",
                             "width": 0,
                             "xtype": "",
                             "items": null

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

@@ -92,15 +92,18 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
         fieldLabel : "单据日期", 
         allowBlank : false, 
         columnWidth : 0.25
-    },{
-        xtype : "textfield", 
-        name : "pi_total", 
-        bind : "{pi_total}", 
-        fieldLabel : "总额", 
-        allowBlank : true,
-        readOnly: true,
-        columnWidth : 0.25
-    }, {
+    }
+    // ,{
+    //     xtype : "textfield", 
+    //     name : "pi_total", 
+    //     bind : "{pi_total}", 
+    //     fieldLabel : "总额", 
+    //     allowBlank : true,
+    //     readOnly: true,
+    //     columnWidth : 0.25
+    // }
+    ,
+     {
         name : "detailGridField", 
         xtype : "detailGridField",
         storeModel:'saas.model.purchase.ProdIODetail',
@@ -224,37 +227,38 @@ Ext.define('saas.view.stock.appropriationInOut.FormPanel', {
                     valueField : "value", 
                     xtype : "dbfindtrigger"
                 }
-            },
-            {
-                text : "单价", 
-                dataIndex : "pd_orderprice",
-                editor : {
-                    xtype : "numberfield"
-                },   
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                items : null
-            }, 
-           {
-                text : "含税金额", 
-                dataIndex : "pd_total", 
-                width : 120.0, 
-                xtype : "numbercolumn"
-            }, {
-                text : "税率", 
-                dataIndex : "pd_taxrate",
-                editor : {
-                    xtype : "numberfield"
-                },   
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                items : null
-            },
-            {
-                text : "未税金额", 
-                dataIndex : "pd_nettotal", 
-                xtype : "numbercolumn"
             }
+        //     ,
+        //     {
+        //         text : "单价", 
+        //         dataIndex : "pd_orderprice",
+        //         editor : {
+        //             xtype : "numberfield"
+        //         },   
+        //         width : 120.0, 
+        //         xtype : "numbercolumn", 
+        //         items : null
+        //     }, 
+        //    {
+        //         text : "含税金额", 
+        //         dataIndex : "pd_total", 
+        //         width : 120.0, 
+        //         xtype : "numbercolumn"
+        //     }, {
+        //         text : "税率", 
+        //         dataIndex : "pd_taxrate",
+        //         editor : {
+        //             xtype : "numberfield"
+        //         },   
+        //         width : 120.0, 
+        //         xtype : "numbercolumn", 
+        //         items : null
+        //     },
+        //     {
+        //         text : "未税金额", 
+        //         dataIndex : "pd_nettotal", 
+        //         xtype : "numbercolumn"
+        //     }
         ]
     }, {
         format : "Y-m-d",