Browse Source

销售单更新审核人、审核时间方法

guq 7 years ago
parent
commit
44a3641fa7

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

@@ -1,5 +1,6 @@
 package com.usoftchina.saas.sale.mapper;
 
+import com.netflix.ribbon.proxy.annotation.ClientProperties;
 import com.usoftchina.saas.base.mapper.CommonBaseMapper;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.sale.dto.PurchaseDTO;
@@ -64,4 +65,7 @@ public interface SaleMapper extends CommonBaseMapper<Sale> {
     String validateCustStatus(Long id);
 
     String validateClose(List<DocBaseDTO> baseDTOs);
+
+    void updateAudit(@Param("id") Long id, @Param("status") String status, @Param("statuscode") String statuscode, @Param("format") String format,
+                     @Param("name") String name);
 }

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

@@ -28,6 +28,7 @@ import com.usoftchina.saas.sale.service.SaleService;
 import com.usoftchina.saas.storage.po.ProdIODetail;
 import com.usoftchina.saas.storage.po.ProdInOut;
 import com.usoftchina.saas.utils.BeanMapper;
+import com.usoftchina.saas.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -256,14 +257,16 @@ public class SaleServiceImpl implements SaleService{
         if (integer > 0) {
             throw new BizException(BizExceptionCode.SALE_CUST_CLOSE);
         }
-        commonService.commonAudit("sale", "sa_id=" + id, "sa_status",
-                "sa_statuscode", "sa_auditdate", "sa_auditman");
+        /*commonService.commonAudit("sale", "sa_id=" + id, "sa_status",
+                "sa_statuscode", "sa_auditdate", "sa_auditman");*/
         //更新销售金额
         updateTotal(id);
         //更新从表总额
         updateTotalAndNetPrice(id);
         //更新从表不含税金额
         updateNetTotal(id);
+        //更新审核状态
+        saleMapper.updateAudit(id, Status.AUDITED.getDisplay(), Status.AUDITED.name(), DateUtils.format(new Date(), "yyyy-MM-dd"), BaseContextHolder.getUserName());
         DocBaseDTO docBaseDTO = getBaseDTOById(id);
         //日志
         messageLogService.audit(docBaseDTO);

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

@@ -429,7 +429,10 @@
   <select id="checkCustomer" parameterType="long" resultType="integer">
     select count(1) from sale left join  customer on sa_custid=cu_id  where  cu_statuscode='CLOSE' and sa_id=#{id}
   </select>
-  
+  <update id="updateAudit">
+    update sale set sa_status=#{status},sa_statuscode=#{statuscode},sa_auditman=#{name},sa_auditdate=#{format} where sa_id=#{id}
+  </update>
+
   <!-- 销售订单转采购单-->
   <insert id="turnPurchase" parameterType="com.usoftchina.saas.sale.dto.PurchaseDTO" >
     <selectKey resultType="java.lang.Long" keyProperty="id">