Merge remote-tracking branch 'origin/dev' into dev

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/ProdIODetailDTO.java

@@ -66,7 +66,7 @@ public class ProdIODetailDTO implements Serializable {
 
     private Long pd_orderid;
 
-    private Integer pd_sdid;
+    private Long pd_sdid;
 
     private Integer pd_status;
 

applications/sale/sale-dto/src/main/java/com/usoftchina/saas/sale/dto/ProdInOutListDTO.java

@@ -117,7 +117,7 @@ public class ProdInOutListDTO extends CommonBaseDTO implements Serializable {
 
     private Integer pd_orderid;
 
-    private Integer pd_sdid;
+    private Long pd_sdid;
 
     private Integer pd_status;
 

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/mapper/ProdInOutMapper.java

@@ -38,4 +38,6 @@ public interface ProdInOutMapper extends CommonBaseMapper<ProdInOut> {
     String validateBatchClose(List<DocBaseDTO> baseDTOs);
 
     String validateBatchOpen(List<DocBaseDTO> baseDTOs);
+
+    void updatePiTotal(Long id);
 }

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

@@ -127,8 +127,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
                 prodIODetailMapper.batchInsert(insertDetails);
             }
             baseDTO = getBaseDTOById(pi_id,pi_class,pi_inoutno);
-            //更新明细金额
-            getTotal(pi_id,pi_class);
             //日志记录
             messageLogService.save(baseDTO);
             return baseDTO;
@@ -155,9 +153,13 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         if (updateDetails.size()>0) {
             prodIODetailMapper.batchUpdate(updateDetails);
         }
+
         baseDTO = getBaseDTOById(pi_id,pi_class,pi_inoutno);
-        //更新已转数
-        updateYqty(prodInOut);
+        ProdInOut prodInOutNow = checkAndReturnOrder(pi_id);
+        //更新明细金额等
+        setTotal(prodInOutNow);
+        //日志
+        messageLogService.update(baseDTO);
         return baseDTO;
 
     }
@@ -179,8 +181,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //主表删除
         prodInOutMapper.deleteByPrimaryKey(id);
         DocBaseDTO docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class(),prodInOut.getPi_inoutno());
-        //更新已转数
-        updateYqty(prodInOut);
+        //更新明细金额等
+        setTotal(prodInOut);
         //日志
        messageLogService.deleteDetail(docBaseDTO);
     }
@@ -190,8 +192,8 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         ProdIODetail prodIODetail = prodIODetailMapper.selectByPrimaryKey(id);
         ProdInOut prodInOut = checkAndReturnOrder(prodIODetail.getPd_piid());
         Integer num = prodIODetailMapper.deleteByPrimaryKey(id);
-        //更新已转数
-        updateYqty(prodInOut);
+        //更新明细金额等
+        setTotal(prodInOut);
         DocBaseDTO docBaseDTO = getBaseDTOById(id,prodInOut.getPi_class(),prodInOut.getPi_inoutno());
         //日志
         messageLogService.deleteDetail(docBaseDTO);
@@ -555,22 +557,6 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
         //return  caller+Math.abs(Math.random()*100);
     }
 
-    /**
-     * @Description: 更新已转数
-     * @Param: [code, id]
-     * @return: java.lang.String
-     * @Author: wuyx
-     * @Date: 2018/10/23
-     */
-    private void updateYqty(ProdInOut prodInOut) {
-        //更新已转数
-        if ("销售出货单".equals(prodInOut.getPi_class())){
-            prodIODetailMapper.updateSaleYqty(prodInOut.getPi_said());
-        }else if ("销售退货单".equals(prodInOut.getPi_class())){
-            prodIODetailMapper.updateSaleOutYqty(prodInOut.getPi_said());
-        }
-    }
-
     /**
      * @Description
      * @Param: [id]
@@ -591,11 +577,24 @@ public class ProdInOutServiceImpl extends CommonBaseServiceImpl<ProdInOutMapper,
     }
 
     //更新最新明细总额
-    private void getTotal(Long id,String pi_class) {
-        if(BillCodeSeq.SALEOUT.getName().equals(pi_class)){
+    private void setTotal(ProdInOut prodInOut ) {
+        String pi_class = prodInOut.getPi_class();
+        Long id = prodInOut.getId();
+        if(BillCodeSeq.SALEOUT.getName().equals(pi_class)){//销售出货单
+            //更新明细
             prodIODetailMapper.updatePDSaleOut(id);
-        }else{
+            //更新主表
+            prodInOutMapper.updatePiTotal(id);
+
+            //更新销售已转数
+            prodIODetailMapper.updateSaleYqty(prodInOut.getPi_said());
+        }else{//销售退货单
+            //更新明细
             prodIODetailMapper.updatePDSaleIN(id);
+            //更新主表
+            prodInOutMapper.updatePiTotal(id);
+            //出货单已转数
+            prodIODetailMapper.updateSaleOutYqty(prodInOut.getPi_said());
         }
     }
 

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/service/impl/SaleServiceImpl.java

@@ -433,6 +433,7 @@ public class SaleServiceImpl implements SaleService{
         prodInOut.setPi_sacode(sale.getSa_code());
         //设置公司id
         prodInOut.setCompanyId(companyId);
+        prodInOut.setPi_address(sale.getSa_toplace());
 
         prodInOutMapper.insertSelective(prodInOut);
         //插入出货单从表
@@ -448,13 +449,14 @@ public class SaleServiceImpl implements SaleService{
             prodIODetail.setPd_orderid(sale.getId());
             prodIODetail.setPd_ordercode(sale.getSa_code());
             prodIODetail.setPd_orderdetno(saleDetail.getSd_detno());
-            prodIODetail.setPd_orderprice(saleDetail.getSd_price());
+            prodIODetail.setPd_sendprice(saleDetail.getSd_price());
+            prodIODetail.setPd_sdid(saleDetail.getId());
             prodIODetail.setPd_prodid(saleDetail.getSd_prodid());
             prodIODetail.setPd_prodcode(saleDetail.getSd_prodcode());
             //公司id
             prodIODetail.setCompanyId(companyId);
             //本次转单数
-            prodIODetail.setPd_inqty((saleDetail.getSd_qty()-saleDetail.getSd_yqty()));
+            prodIODetail.setPd_outqty((saleDetail.getSd_qty()-saleDetail.getSd_yqty()));
             prodIODetailMapper.insertSelective(prodIODetail);
             //更新已转数
             saleDetail.setSd_yqty(saleDetail.getSd_qty());

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

@@ -615,12 +615,12 @@
       (
       #{item.pd_piid,jdbcType=INTEGER},#{item.pd_inoutno,jdbcType=VARCHAR},#{item.pd_piclass,jdbcType=VARCHAR},#{item.pd_pdno,jdbcType=INTEGER},#{item.pd_ordercode,jdbcType=VARCHAR},
       #{item.pd_orderdetno,jdbcType=INTEGER},#{item.pd_prodid,jdbcType=INTEGER},#{item.pd_prodcode,jdbcType=VARCHAR},#{item.pd_unit,jdbcType=VARCHAR},
-      #{item.pd_inqty,jdbcType=INTEGER},#{item.pd_outqty,jdbcType=INTEGER},#{item.pd_orderprice,jdbcType=DOUBLE},#{item.pd_sendprice,jdbcType=DOUBLE},#{item.pd_price,jdbcType=DOUBLE},
+      #{item.pd_inqty,jdbcType=DOUBLE},#{item.pd_outqty,jdbcType=DOUBLE},#{item.pd_orderprice,jdbcType=DOUBLE},#{item.pd_sendprice,jdbcType=DOUBLE},#{item.pd_price,jdbcType=DOUBLE},
       #{item.pd_total,jdbcType=DOUBLE},#{item.pd_taxrate,jdbcType=DOUBLE},#{item.pd_netprice,jdbcType=DOUBLE},#{item.pd_nettotal,jdbcType=DOUBLE},
-      #{item.pd_whid,jdbcType=INTEGER},#{item.pd_whcode,jdbcType=VARCHAR},#{item.pd_whname,jdbcType=VARCHAR},#{item.pd_inwhid,jdbcType=INTEGER},#{item.pd_inwhcode,jdbcType=VARCHAR},
-      #{item.pd_inwhname,jdbcType=VARCHAR},#{item.pd_orderid,jdbcType=INTEGER},#{item.pd_sdid,jdbcType=INTEGER},#{item.pd_status,jdbcType=VARCHAR},#{item.pd_remark,jdbcType=VARCHAR},
+      #{item.pd_whid},#{item.pd_whcode,jdbcType=VARCHAR},#{item.pd_whname,jdbcType=VARCHAR},#{item.pd_inwhid},#{item.pd_inwhcode,jdbcType=VARCHAR},
+      #{item.pd_inwhname,jdbcType=VARCHAR},#{item.pd_orderid},#{item.pd_sdid},#{item.pd_status,jdbcType=VARCHAR},#{item.pd_remark,jdbcType=VARCHAR},
       #{item.companyId,jdbcType=INTEGER},#{item.updaterId,jdbcType=INTEGER},#{item.updateTime,jdbcType=TIMESTAMP},#{item.pd_text1,jdbcType=VARCHAR},#{item.pd_text2,jdbcType=VARCHAR},
-      #{item.pd_text3,jdbcType=VARCHAR},#{item.pd_text4,jdbcType=VARCHAR},#{item.pd_text5,jdbcType=VARCHAR},#{item.pd_ym,jdbcType=INTEGER},#{item.pd_yqty,jdbcType=INTEGER}
+      #{item.pd_text3,jdbcType=VARCHAR},#{item.pd_text4,jdbcType=VARCHAR},#{item.pd_text5,jdbcType=VARCHAR},#{item.pd_ym,jdbcType=INTEGER},#{item.pd_yqty,jdbcType=DOUBLE}
       )
     </foreach>
   </insert>
@@ -738,19 +738,22 @@
   </update>
 
   <update id="updateSaleOutYqty" parameterType="long">
-update prodiodetail
-  set a.pd_yqty =IFNULL((select  b.pd_inqty  from  (select pi_said,sum(pd_inqty) pd_inqty from  prodiodetail left join prodinout on pd_piid = pi_id where pd_piclass='销售退货单'
-and pi_said=#{id}  GROUP BY pd_ioid) b where IFNULL(b.pd_ioid ,0)= a.pd_id ),0)
-where a.pd_piid = (select pi_id from prodinout where pi_said=#{id} and pi_class='销售出货单')
+update prodiodetail a
+  set a.pd_yqty =IFNULL(
+    (
+      select  b.pd_inqty  from
+        (select pd_ioid,sum(pd_inqty) pd_inqty from  prodiodetail  where pd_piclass='销售退货单'
+          and pd_piid=#{id}  GROUP BY pd_ioid ) b
+          where IFNULL(b.pd_ioid ,0)= a.pd_id
+     ),0)
+where a.pd_id in (select pd_ioid from prodiodetail where pd_piid=#{id} and pi_class='销售出货单')
   </update>
   <update id="updateSaleYqty" parameterType="long">
-    update saledetail
-    set a.sd_yqty =IFNULL((
-    select  b.pd_ounqty  from  (select pi_said,sum(pd_outqty) pd_outqty
-      from  prodiodetail left join prodinout on pd_piid = pi_id where pd_piclass='销售出货单'
-      and pi_said=#{id}  GROUP BY pi_said) b where IFNULL(b.pd_ioid ,0)= a.pd_id
-      ),0)
-    where a.sd_said = #{id}
+
+    update saledetail a set a.sd_yqty =IFNULL( ( select b.pd_outqty from (
+    select pd_sdid,sum(pd_outqty) pd_outqty from prodiodetail left join
+    prodinout on pd_piid = pi_id where pd_piclass='销售出货单' and pi_said=#{id}
+    GROUP BY pd_sdid) b where IFNULL(b.pd_sdid ,0) = a.sd_id ),0) where a.sd_said =#{id}
   </update>
 
   <select id="selectByFK" parameterType="long" resultMap="BaseResultMap">
@@ -760,14 +763,14 @@ where a.pd_piid = (select pi_id from prodinout where pi_said=#{id} and pi_class=
 
   <update id="updatePDSaleIN" parameterType="long">
    update prodiodetail set
-   pd_total=IFNULL(pd_inqty,0)*IFNULL(pd_orderprice,0),
+   pd_total=IFNULL(pd_inqty,0)*IFNULL(pd_sendprice,0),
    pd_netprice = IFNULL(pd_sendprice,0)/(1+IFNULL(pd_taxrate,0)/100),
    pd_nettotal = (IFNULL(pd_sendprice,0)/(1+IFNULL(pd_taxrate,0)/100))*IFNULL(pd_inqty,0)
    where pd_piid=#{id}
   </update>
   <update id="updatePDSaleOut" parameterType="long">
     update prodiodetail set
-    pd_total=IFNULL(pd_outqty,0)*IFNULL(pd_orderprice,0),
+    pd_total=IFNULL(pd_outqty,0)*IFNULL(pd_sendprice,0),
     pd_netprice = IFNULL(pd_sendprice,0)/(1+IFNULL(pd_taxrate,0)/100),
     pd_nettotal = (IFNULL(pd_sendprice,0)/(1+IFNULL(pd_taxrate,0)/100))*IFNULL(pd_outqty,0)
     where pd_piid=#{id}

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

@@ -538,4 +538,10 @@
       #{item.id}
     </foreach>
   </select>
+  <update id="updatePiTotal"  parameterType="long">
+   update ProdInOut SET
+   pi_total = round(IFNULL((SELECT sum(round(pd_total,2)) FROM ProdIODetail WHERE pd_piid=pi_id),0),2)
+   where pi_id = #{id}
+  </update>
+
 </mapper>

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdIODetailDTO.java

@@ -63,7 +63,7 @@ public class ProdIODetailDTO extends CommonBaseDTO implements Serializable {
 
     private Integer pd_orderid;
 
-    private Integer pd_sdid;
+    private Long pd_sdid;
 
     private Integer pd_status;
 

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/dto/ProdInOutListDTO.java

@@ -122,7 +122,7 @@ public class ProdInOutListDTO extends CommonBaseEntity implements Serializable {
 
     private Integer pd_orderid;
 
-    private Integer pd_sdid;
+    private Long pd_sdid;
 
     private Integer pd_status;
 

applications/storage/storage-dto/src/main/java/com/usoftchina/saas/storage/po/ProdIODetail.java

@@ -59,7 +59,7 @@ public class ProdIODetail extends CommonBaseEntity implements Serializable {
 
     private Long pd_orderid;
 
-    private Integer pd_sdid;
+    private Long pd_sdid;
 
     private Integer pd_status;
 

frontend/saas-web/app/view/core/form/FormPanelController.js

@@ -180,11 +180,18 @@ Ext.define('saas.view.core.form.FormPanelController', {
             });
         }
     },
-    codeEditorBlur: function() {
+    codeEditorBlur: function(e) {
         var me = this,
-        viewModel = me.getViewModel();
-
-        viewModel.set('base.codeEditable', false);
+        viewModel = me.getViewModel(),
+        targetEl = event.target,
+        faEl = targetEl.getElementsByClassName('fa')[0];
+
+        if(faEl && faEl.classList.contains('fa-check-circle')) {
+            // 处理重复触发事件
+            // viewModel.set('base.codeEditable', false);
+        }else {
+            viewModel.set('base.codeEditable', false);
+        }
     },
     codeEditorClick: function() {
         var me = this,

frontend/saas-web/app/view/document/product/FormPanel.js

@@ -54,7 +54,7 @@ Ext.define('saas.view.document.product.FormPanel', {
         editable:false,
         xtype : "remotecombo", 
         storeUrl:'/api/document/producttype/getCombo',
-        name : "pr_type", 
+        name : "pr_kind", 
         fieldLabel : "物料类型", 
         allowBlank : false, 
         columnWidth : 0.25,

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

@@ -189,34 +189,53 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 dataIndex : "pd_whcode",
                 hidden:true
             },
+            // {
+            //     text : "仓库", 
+            //     dataIndex : "pd_whname", 
+            //     width : 120.0, 
+            //     items : null,
+            //     editor : {
+            //         editable:false,
+            //         xtype : "remotecombo", 
+            //         storeUrl:'/api/document/warehouse/getCombo',
+            //         name : "wh_name", 
+            //         hiddenBtn:false,//true 则会关闭新增按钮功能
+            //         addHandler:function(b){
+            //             var document = Ext.create('saas.view.document.kind.Kind',{});
+            //             var form =this.ownerCmp.ownerCt.ownerCmp.ownerCt;
+            //             this.dialog = form.getController().getView().add({
+            //                 xtype: 'document-kind-childwin',
+            //                 bind: {
+            //                     title: '新增供应商类型'
+            //                 },
+            //                 dataKind:'warehouse',
+            //                 belong:document.etc['warehouse'],
+            //                 _parent:form,
+            //                 _combo:this.ownerCmp,
+            //                 record:null,
+            //                 session: true
+            //             });
+            //             this.dialog.show();
+            //         }
+            //     }
+            // },
             {
                 text : "仓库", 
                 dataIndex : "pd_whname", 
                 width : 120.0, 
                 items : null,
                 editor : {
-                    editable:false,
-                    xtype : "remotecombo", 
-                    storeUrl:'/api/document/warehouse/getCombo',
-                    name : "wh_name", 
-                    hiddenBtn:false,//true 则会关闭新增按钮功能
-                    addHandler:function(b){
-                        var document = Ext.create('saas.view.document.kind.Kind',{});
-                        var form =this.ownerCmp.ownerCt.ownerCmp.ownerCt;
-                        this.dialog = form.getController().getView().add({
-                            xtype: 'document-kind-childwin',
-                            bind: {
-                                title: '新增供应商类型'
-                            },
-                            dataKind:'warehouse',
-                            belong:document.etc['warehouse'],
-                            _parent:form,
-                            _combo:this.ownerCmp,
-                            record:null,
-                            session: true
-                        });
-                        this.dialog.show();
-                    }
+                    displayField : "display", 
+                    editable : true, 
+                    format : "", 
+                    hideTrigger : false, 
+                    maxLength : 100.0, 
+                    minValue : null, 
+                    positiveNum : false, 
+                    queryMode : "local", 
+                    store : null, 
+                    valueField : "value", 
+                    xtype : "dbfindtrigger"
                 }
             },
             {

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

@@ -19,7 +19,7 @@ Ext.define('saas.view.sale.sale.FormPanelController', {
                             },{
                                 from:'cu_name',to:'sa_custname'
                             },{
-                                from:'ca_address',to:'sa_address'
+                                from:'ca_address',to:'sa_toplace'
                         }],
                         dbtpls:[{
                             field:'cu_code',width:100

frontend/saas-web/app/view/sale/sale/QueryPanel.js

@@ -82,7 +82,7 @@ Ext.define('saas.view.sale.sale.QueryPanel', {
         }, {
             text: '销售单号',
             dataIndex: 'sa_code',
-            width: 120
+            width: 180
         }, {
             text: '客户编号',
             dataIndex: 'sa_cucode',

frontend/saas-web/app/view/sale/saleIn/QueryPanel.js

@@ -79,7 +79,7 @@ Ext.define('saas.view.sale.saleIn.QueryPanel', {
         }, {
             text: '单据编号',
             dataIndex: 'pi_inoutno',
-            width: 150
+            width: 180
         }, {
             text: '单据状态',
             dataIndex: 'pi_status',

frontend/saas-web/app/view/sale/saleOut/FormPanel.js

@@ -164,7 +164,10 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
                 text : "金额", 
                 dataIndex : "pd_total", 
                 width : 120.0, 
-                xtype : "numbercolumn"
+                xtype : "numbercolumn",
+                editor : {
+                    xtype : "numberfield"
+                },
             }, {
                 text : "税率", 
                 dataIndex : "pd_taxrate", 
@@ -205,6 +208,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
         format : "Y-m-d", 
         xtype : "datefield", 
         name : "pi_recorddate", 
+        
         fieldLabel : "录入日期",
         readOnly:true
     }, {

frontend/saas-web/app/view/sale/saleOut/QueryPanel.js

@@ -79,7 +79,7 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
         }, {
             text: '单据编号',
             dataIndex: 'pi_inoutno',
-            width: 150
+            width: 180
         }, {
             text: '单据状态',
             dataIndex: 'pi_status',