caller枚举类

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/dto/ListReqDTO.java

@@ -34,6 +34,13 @@ public class ListReqDTO implements Serializable {
         this.mode = mode;
     }
 
+    /**
+    * @Description 拼最后查询条件
+    * @Param: []
+    * @return: java.lang.String
+    * @Author: guq
+    * @Date: 2018/10/25
+    */
     public String getFinalCondition() {
         try {
             JSONArray jsonArray = JSONArray.parseArray(this.condition);
@@ -76,10 +83,11 @@ public class ListReqDTO implements Serializable {
                 }
                 return finalCondition.substring(0, finalCondition.length() - 3);
             }
+            return null;
         }catch (Exception e){
             return null;
         }
-        return null;
+
     }
 }
 

applications/commons/commons-dto/src/main/java/com/usoftchina/saas/commons/po/BillCodeSeq.java

@@ -0,0 +1,67 @@
+package com.usoftchina.saas.commons.po;
+
+/**
+ * @author: guq
+ * @create: 2018-10-25 09:36
+ **/
+public enum  BillCodeSeq {
+
+    PRODUCT("物料资料", "Product"),
+
+    CUSTOMER("客户资料", "Customer"),
+
+    VENDOR("供应商资料", "Vendor"),
+
+    WAREHOUSE("仓库资料", "Warehouse"),
+
+    PURCHASE("采购订单", "Purchase"),
+
+    PURCHASEIN("采购验收单", "PurchaseIn"),
+
+    PURCHASEOUT("采购验退单", "PurchaseOut"),
+
+    SALE("销售订单", "Sale"),
+
+    SALEOUT("销售出货单", "SaleOut"),
+
+    SALEIN("销售退货单", "SaleIn"),
+
+    OTHERIN("其它入库单", "OtherIn"),
+
+    OTHEROUT("其它出库单", "OtherOut"),
+
+    APPROPRIATIONINOUT("调拨单", "AppropriationInOut"),
+
+    MAKE("制造单", "Make"),
+
+    PAYBALANCE("付款单", "PayBalance"),
+
+    RECBALANCE("收款单", "RecBalance"),
+
+    VERIFICATION("核价单", "Verification");
+
+    BillCodeSeq(String name, String caller) {
+        this.name = name;
+        this.caller = caller;
+    }
+
+    private String name;
+    private String caller;
+
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getCaller() {
+        return caller;
+    }
+
+    public void setCaller(String caller) {
+        this.caller = caller;
+    }
+}

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

@@ -4,6 +4,8 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 /**
  * @author: guq
@@ -12,8 +14,17 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 @SpringBootApplication
 @MapperScan("com.usoftchina.saas.sale.mapper")
 @EnableEurekaClient
-public class SaleApplication {
+public class SaleApplication extends WebMvcConfigurerAdapter {
     public static void main(String[] args) {
         SpringApplication.run(SaleApplication.class, args);
     }
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+
+        registry.addMapping("/**")
+                .allowCredentials(true)
+                .allowedHeaders("*")
+                .allowedOrigins("*")
+                .allowedMethods("*");
+    }
 }

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

@@ -31,4 +31,6 @@ public interface SaleMapper {
     String validateAudit(List<DocBaseDTO> baseDTOs);
 
     Integer validateCodeWhenUpdate(@Param("code") String code,@Param("id") Long id);
+
+    void updateTotal(Long id);
 }

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

@@ -133,6 +133,8 @@ public class SaleServiceImpl implements SaleService{
                 saledetailMapper.batchInsert(insertDetails);
             }
             baseDTO = getBaseDTOById(sa_id);
+            //更新销售金额
+            getTotal(sa_id);
             //日志记录
             //messageLogService.save(baseDTO);
             return baseDTO;
@@ -159,6 +161,8 @@ public class SaleServiceImpl implements SaleService{
             saledetailMapper.batchUpdate(updateDetails);
         }
         baseDTO = getBaseDTOById(sa_id);
+        //更新销售金额
+        getTotal(sa_id);
         //日志
         //messageLogService.save(baseDTO);
         return baseDTO;
@@ -482,5 +486,12 @@ public class SaleServiceImpl implements SaleService{
         //messageLogService.unAudit(docBaseDTO);
     }
 
+    //更新最新销售总额
+    private void getTotal(Long id) {
+        if (null == id) {
+            return;
+        }
+        saleMapper.updateTotal(id);
+    }
 
 }

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

@@ -361,4 +361,7 @@
   <select id="validateUnAudit" parameterType="long" resultType="java.lang.String">
     select sa_code from sale where sa_id = #{id} and IFNULL(sa_statuscode,'UNAUDITED')='UNAUDITED'
   </select>
+  <update id="updateTotal" parameterType="long">
+    	update sale a set sa_total=(select sum(sd_price*sd_qty) from saledetail b where b.sd_said=a.sa_id ) where sa_id=#{id};
+  </update>
 </mapper>