Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

applications/purchase/purchase-server/src/main/java/com/usoftchina/saas/purchase/controller/PurchaseController.java

@@ -94,8 +94,7 @@ public class PurchaseController {
      */
     @PostMapping("/audit")
     public Result audit(@RequestBody PurchaseFormDTO formData) {
-        DocBaseDTO audit = purchaseService.audit(formData);
-        return Result.success(audit);
+        return purchaseService.audit(formData);
     }
 
     /**

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

@@ -36,4 +36,5 @@ public interface ProdIODetailMapper extends CommonBaseMapper<ProdIODetail> {
     void calcProdOut(@Param("pi_id") Long pi_id);
 
     void getDefaultWarehouseByProduct(@Param("pi_id") Long pi_id);
+
 }

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

@@ -28,6 +28,8 @@ public interface PurchasedetailMapper extends CommonBaseMapper<Purchase> {
 
     void calcPurchase(Long pu_id);
 
+    String checkzxbzs(Long id);
+
 //    void getVendorTaxrate(Long pu_id);
 //
 //    void getPrice(Long pu_id);

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

@@ -71,7 +71,9 @@ public interface PurchaseService extends CommonBaseService<PurchaseMapper, Purch
      * @param formData
      * @return
      */
-    DocBaseDTO audit(PurchaseFormDTO formData);
+    Result audit(PurchaseFormDTO formData);
+
+
 
     /**
     * @Description 批量审核

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

@@ -206,7 +206,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
 
     @Override
     @Transactional
-    public DocBaseDTO audit(PurchaseFormDTO formData) {
+    public Result audit(PurchaseFormDTO formData) {
         Long id = null;
         DocBaseDTO baseDTO = null;
         if (null != formData) {
@@ -215,9 +215,9 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
                 baseDTO = saveFormData(formData);
                 id = baseDTO.getId();
             }
-            singleAudit(id);
+            return singleAudit(id);
         }
-        return baseDTO;
+        return Result.error("数据为空");
     }
 
     @Override
@@ -467,7 +467,11 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         return Result.success(baseDTO);
     }
 
-    private void singleAudit(Long id) {
+    private Result singleAudit(Long id) {
+        DocBaseDTO docBaseDTO = getBaseDTOById(id);
+        Result result = Result.success(docBaseDTO);
+        //检查最小包装数
+        result.setMessage(purchasedetailMapper.checkzxbzs(id));
         Purchase purchase = new Purchase();
         //生成更新对象
         purchase.setId(id);
@@ -479,9 +483,9 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
         purchaseMapper.updateByPrimaryKeySelective(purchase);
         //更新最新采购单价
         productApi.updateLatestPurchasePrice(id);
-        DocBaseDTO docBaseDTO = getBaseDTOById(id);
         //日志
         messageLogService.audit(docBaseDTO);
+        return result;
     }
 
     private void singleUnAudit(Long id) {

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

@@ -465,9 +465,12 @@
   </update>
 
 
-
-
-
+  <select id="checkzxbzs" parameterType="long" resultType="string">
+    select GROUP_CONCAT(CONCAT(PD_DETNO,'行',PD_PRODCODE,'物料采购数量不是最小包装数',round(pr_zxbzs,0),'的整数倍')) from purchasedetail left join product on PD_PRODID = pr_id
+    where
+    MOD(PD_QTY,pr_zxbzs)!=0 and
+    PD_PUID = #{id,jdbcType=INTEGER};
+  </select>
 
 
 </mapper>

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

@@ -88,6 +88,8 @@ public class ProdIODetailDTO implements Serializable {
 
     private Long pd_ioid;
 
+    private Double pd_ordertotal;
+
     private ProductDTO productDTO;
 
 }

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

@@ -55,4 +55,8 @@ public class SaleDTO extends CommonBaseDTO{
     private String sa_text4;
 
     private String sa_text5;
+
+    private String sa_auditman;
+
+    private Date sa_auditdate;
 }

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

@@ -6,6 +6,7 @@ import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.storage.po.ProdInOut;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.HashMap;
 import java.util.List;
 
 public interface ProdInOutMapper extends CommonBaseMapper<ProdInOut> {
@@ -40,4 +41,6 @@ public interface ProdInOutMapper extends CommonBaseMapper<ProdInOut> {
     String validateBatchOpen(List<DocBaseDTO> baseDTOs);
 
     void updatePiTotal(Long id);
+
+    List<HashMap<String, Object>> getWareHouseByCode(@Param("code") String code, @Param("companyId") Long companyId);
 }

applications/sale/sale-server/src/main/java/com/usoftchina/saas/sale/po/Sale.java

@@ -54,4 +54,8 @@ public class Sale extends CommonBaseEntity{
     private String sa_text4;
 
     private String sa_text5;
+
+    private String sa_auditman;
+
+    private Date sa_auditdate;
 }

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

@@ -30,9 +30,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * @author: guq
@@ -238,6 +236,8 @@ public class SaleServiceImpl implements SaleService{
         sale.setSa_statuscode(Status.AUDITED.name());
         sale.setUpdateTime(new Date());
         sale.setUpdaterId(BaseContextHolder.getUserId());
+        sale.setSa_auditman("TESTADMIN");
+        sale.setSa_auditdate(new Date());
         //更新存在字段
         saleMapper.updateByPrimaryKeySelective(sale);
         //更新销售金额
@@ -462,6 +462,13 @@ public class SaleServiceImpl implements SaleService{
             prodIODetail.setCompanyId(companyId);
             //本次转单数
             prodIODetail.setPd_outqty(saleDetail.getSd_qty() - saleDetail.getSd_yqty());
+            //获取物料默认仓库
+            Map<String, Object> warehouse = getWareHouseByCode(saleDetail.getSd_prodcode());
+            if (null != warehouse) {
+                prodIODetail.setPd_whid(warehouse.get("pr_whid") == null ? 0 : Integer.valueOf(warehouse.get("pr_whid").toString()));
+                prodIODetail.setPd_whcode(String.valueOf(warehouse.get("pr_whcode")));
+                prodIODetail.setPd_whname(String.valueOf(warehouse.get("pr_whname")));
+            }
             prodIODetailMapper.insertSelective(prodIODetail);
             //更新已转数
             saleDetail.setSd_yqty(saleDetail.getSd_qty());
@@ -573,4 +580,16 @@ public class SaleServiceImpl implements SaleService{
         return baseDTO;
     }
 
+    private Map<String, Object> getWareHouseByCode(String code) {
+        if (StringUtils.isEmpty(code)) {
+            return null;
+        }
+        Long companyId = BaseContextHolder.getCompanyId();
+        List<HashMap<String, Object>> list = prodInOutMapper.getWareHouseByCode(code, companyId);
+        if (null != list) {
+            return list.get(0);
+        }
+        return null;
+    }
+
 }

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

@@ -41,6 +41,7 @@
     <result column="pd_ym" jdbcType="INTEGER" property="pd_ym" />
     <result column="pd_yqty" jdbcType="INTEGER" property="pd_yqty" />
     <result column="pd_ioid" jdbcType="INTEGER" property="pd_ioid" />
+    <result column="pd_ordertotal" jdbcType="DOUBLE" property="pd_ordertotal" />
     <association property="productDTO" javaType="com.usoftchina.saas.document.dto.ProductDTO">
       <id column="pr_id" property="id"/>
       <result column="pr_code" property="pr_code"/>
@@ -759,14 +760,14 @@ update prodiodetail a
 
   <update id="updatePDSaleIN" parameterType="long">
    update prodiodetail set
-   pd_total=round(IFNULL(pd_inqty,0)*IFNULL(pd_sendprice,0),2),
+   pd_ordertotal=round(IFNULL(pd_inqty,0)*IFNULL(pd_sendprice,0),2),
    pd_netprice = round(IFNULL(pd_sendprice,0)/(1+IFNULL(pd_taxrate,0)/100),2),
    pd_nettotal = round((IFNULL(pd_sendprice,0)/(1+IFNULL(pd_taxrate,0)/100))*IFNULL(pd_inqty,0),2)
    where pd_piid=#{id}
   </update>
   <update id="updatePDSaleOut" parameterType="long">
     update prodiodetail set
-    pd_total=round(IFNULL(pd_outqty,0)*IFNULL(pd_sendprice,0),2),
+    pd_ordertotal=round(IFNULL(pd_outqty,0)*IFNULL(pd_sendprice,0),2),
     pd_netprice = round(IFNULL(pd_sendprice,0)/(1+IFNULL(pd_taxrate,0)/100),2),
     pd_nettotal = round((IFNULL(pd_sendprice,0)/(1+IFNULL(pd_taxrate,0)/100))*IFNULL(pd_outqty,0),2)
     where pd_piid=#{id}

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

@@ -540,9 +540,13 @@
   </select>
   <update id="updatePiTotal"  parameterType="long">
 update ProdInOut SET
-		 pi_total = ( select IFNULL(sum(IFNULL(pd_total,0)),0) FROM ProdIODetail WHERE pd_piid=#{id}),
+		 pi_total = ( select IFNULL(sum(IFNULL(pd_ordertotal,0)),0) FROM ProdIODetail WHERE pd_piid=#{id}),
 		 pi_nettotal = ( select IFNULL(sum(IFNULL(pd_nettotal,0)),0) FROM ProdIODetail WHERE pd_piid=#{id})
 			where pi_id =#{id}
   </update>
 
+  <select id="getWareHouseByCode" resultType="java.util.HashMap">
+    select pr_whid,pr_whcode,pr_whname from product where pr_code=#{code} and companyid=#{companyId} and pr_statuscode='OPEN'
+  </select>
+
 </mapper>

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

@@ -28,12 +28,14 @@
     <result column="sa_text3" property="sa_text3" jdbcType="VARCHAR" />
     <result column="sa_text4" property="sa_text4" jdbcType="VARCHAR" />
     <result column="sa_text5" property="sa_text5" jdbcType="VARCHAR" />
+    <result column="sa_auditman" property="sa_auditman" jdbcType="VARCHAR" />
+    <result column="sa_auditdate" property="sa_auditdate" jdbcType="TIMESTAMP"/>
   </resultMap>
   <sql id="Base_Column_List" >
     sa_id, sa_code, sa_custid, sa_custcode, sa_custname, sa_toplace, sa_total, sa_totalupper, 
     sa_remark, sa_status, sa_statuscode, sa_sendstatuscode, sa_sendstatus, sa_printstatus, 
     sa_printstatuscode, sa_recorderid, sa_recorder, sa_recorddate, companyId, updaterId, 
-    updateTime, sa_text1, sa_text2, sa_text3, sa_text4, sa_text5
+    updateTime, sa_text1, sa_text2, sa_text3, sa_text4, sa_text5,sa_auditman,sa_auditdate
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Long" >
     select 
@@ -303,6 +305,12 @@
       <if test="sa_text5 != null" >
         sa_text5 = #{sa_text5,jdbcType=VARCHAR},
       </if>
+      <if test="sa_auditman != null" >
+        sa_auditman = #{sa_auditman,jdbcType=VARCHAR},
+      </if>
+      <if test="sa_auditdate != null" >
+        sa_auditdate = #{sa_auditdate,jdbcType=TIMESTAMP},
+      </if>
     </set>
     where sa_id = #{id,jdbcType=INTEGER}
   </update>

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

@@ -81,6 +81,8 @@ public class ProdIODetail extends CommonBaseEntity implements Serializable {
 
     private Long pd_ioid;
 
+    private Double pd_ordertotal;
+
     private ProductDTO productDTO;
 
 }

frontend/saas-web/app/model/sale/ProdIODetail.js

@@ -35,6 +35,7 @@ Ext.define('saas.model.sale.ProdIODetail', {
         { name: 'pd_yqty', type: 'int' },
         { name: 'pd_remark', type: 'string' },
         { name: 'pd_ioid', type: 'int' },
+        { name: 'pd_ordertotal', type: 'float' }
     ],
     //一对一映射
     associations: [{ type: 'hasOne', model: 'saas.model.document.Product', associationKey: 'productDTO'}]

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

@@ -105,11 +105,14 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 var newTitle = form._title + '(' + code + ')';
 
                 refreshTabTitle(newId, newTitle);
+
+                form.fireEvent('aftersave', true, form, localJson);
             }
         })
         .catch(function(res) {
             console.error(res);
             showToast('保存失败: ' + res.message);
+            form.fireEvent('aftersave', false, form, res);
         });
     },
 
@@ -164,7 +167,8 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 }
                 form.FormUtil.loadData(form);
                 form.setEditable(false);
-                showToast('审核成功');
+                showToast('审核成功' + (localJson.message ? ': ' + localJson.message : ''));
+                form.fireEvent('afteraudit', true, form, localJson);
             }
         })
         .catch(function(res) {
@@ -182,6 +186,7 @@ Ext.define('saas.view.core.form.FormPanelController', {
                 form.FormUtil.loadData(form);
             }
             showToast('审核失败: ' + res.message);
+            form.fireEvent('afteraudit', false, form, res);
         });
     },
     unAudit: function() {

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

@@ -157,7 +157,8 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 width : 120.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8
+                    decimalPrecision: 8,
+                    editable : false
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -206,7 +207,8 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 width : 120.0, 
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 2
+                    decimalPrecision: 2,
+                    editable : false
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -228,7 +230,8 @@ Ext.define('saas.view.purchase.purchase.FormPanel', {
                 width : 120.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 2
+                    decimalPrecision: 2,
+                    editable : false
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');

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

@@ -189,7 +189,8 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                 width : 120.0,
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 8
+                    decimalPrecision: 8,
+                    editable : false
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -249,14 +250,24 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 },
-            }, 
-           {
+            }, {
+                text : "税率", 
+                dataIndex : "pd_taxrate", 
+                width : 120.0,
+                editor : {
+                    xtype : "numberfield",
+                    decimalPrecision: 0,
+                    minValue: 0,
+                    maxValue: 100
+                }
+            },{
                 text : "含税金额", 
                 dataIndex : "pd_total", 
                 width : 120.0, 
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 2
+                    decimalPrecision: 2,
+                    editable : false
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');
@@ -271,23 +282,14 @@ Ext.define('saas.view.purchase.purchaseIn.FormPanel', {
                     var format = '0,000.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
-            }, {
-                text : "税率", 
-                dataIndex : "pd_taxrate", 
-                width : 120.0,
-                editor : {
-                    xtype : "numberfield",
-                    decimalPrecision: 0,
-                    minValue: 0,
-                    maxValue: 100
-                }
             },
             {
                 text : "未税金额", 
                 dataIndex : "pd_nettotal", 
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 2
+                    decimalPrecision: 2,
+                    editable : false
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');

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

@@ -174,15 +174,18 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                     var format = '0.' + xr.join();
                     return Ext.util.Format.number(v, format);
                 }
-            },            {
-                text : "已转数", 
-                dataIndex : "pd_yqty", 
-                width : 120.0, 
-                xtype : "numbercolumn", 
-                format:'0',
-                items : null,
-                summaryType: 'sum'
-            },{
+            },            
+            // {
+            //     text : "已转数", 
+            //     dataIndex : "pd_yqty", 
+            //     width : 120.0, 
+            //     xtype : "numbercolumn", 
+            //     format:'0',
+            //     items : null,
+            //     summaryType: 'sum'
+            // },
+            
+            {
                 text : "仓库id", 
                 dataIndex : "pd_whid", 
                 xtype : "numbercolumn",
@@ -222,29 +225,47 @@ Ext.define('saas.view.purchase.purchaseOut.FormPanel', {
                 dataIndex : "pd_orderprice", 
                 width : 120.0, 
                 xtype : "numbercolumn"
-            }, 
-           {
-                text : "含税金额", 
-                dataIndex : "pd_total", 
-                width : 120.0, 
-                xtype : "numbercolumn",
-                summaryType: 'sum'
-            }, {
+            },{
                 text : "税率", 
-                dataIndex : "pd_taxrate",
+                dataIndex : "pd_taxrate", 
+                width : 120.0,
                 editor : {
                     xtype : "numberfield",
                     decimalPrecision: 0,
                     minValue: 0,
                     maxValue: 100
                 }
+            }, 
+            {
+                text : "含税金额", 
+                dataIndex : "pd_total", 
+                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 : "pd_nettotal", 
                 editor : {
                     xtype : "numberfield",
-                    decimalPrecision: 2
+                    decimalPrecision: 2,
+                    editable : false
                 },
                 renderer : function(v) {
                     var arr = (v + '.').split('.');

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

@@ -172,7 +172,7 @@ Ext.define('saas.view.sale.saleIn.FormPanel', {
             }, 
            {
                 text : "含税金额", 
-                dataIndex : "pd_total", 
+                dataIndex : "pd_ordertotal", 
                 width : 120.0, 
                 editor : {
                     xtype : "numberfield",

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

@@ -183,7 +183,7 @@ Ext.define('saas.view.sale.saleout.FormPanel', {
             }, 
            {
                 text : "含税金额", 
-                dataIndex : "pd_total", 
+                dataIndex : "pd_ordertotal", 
                 width : 120.0, 
                 editor : {
                     xtype : "numberfield",

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

@@ -107,11 +107,10 @@ Ext.define('saas.view.sale.saleout.QueryPanel', {
             xtype:'numbercolumn',
             width: 120
         },{
-            text: '未税金额',
+            text: '未含税金额',
             dataIndex: 'pi_nettotal',
             xtype:'numbercolumn',
-            width: 120,
-            flex: 1
+            width: 120
         }],
         relativeColumn: [{
             text: 'id',