修改状态枚举类Status

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

@@ -14,10 +14,40 @@ public enum Status {
     /**
      * 已审核
      */
-    AUDITED("已审核");
+    AUDITED("已审核"),
 
+    /**
+     * 未入库
+     */
+    UNTURNIN("未入库"),
+
+    /**
+     * 部分入库
+     */
+    PART2IN("部分入库"),
+
+    /**
+     * 已入库
+     */
+    TURNIN("已入库"),
+
+    /**
+     * 部分出库
+     */
+    PARTOUT("部分出库"),
+
+    /**
+     * 已出库
+     */
+    TURNOUT("已出库"),
+
+    /**
+     * 未出库
+     */
+    UNTURNOUT("未出库")
 
 
+    ;
     private String display;
     private Status(String display){
         this.display = display;

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

@@ -1,22 +0,0 @@
-package com.usoftchina.saas.purchase.po;
-
-public enum Status {
-    /**
-     * 在录入
-     */
-    UNAUDITED("未审核"),
-
-    /**
-     * 已审核
-     */
-    AUDITED("已审核");
-
-    private String display;
-    private Status(String display){
-        this.display = display;
-    }
-
-    public String getDisplay(){
-        return display;
-    }
-}

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

@@ -10,6 +10,7 @@ import com.usoftchina.saas.commons.dto.BatchDealBaseDTO;
 import com.usoftchina.saas.commons.dto.DocBaseDTO;
 import com.usoftchina.saas.commons.dto.ListReqDTO;
 import com.usoftchina.saas.commons.exception.BizExceptionCode;
+import com.usoftchina.saas.commons.po.Status;
 import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.exception.ExceptionCode;
@@ -254,13 +255,13 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     @Override
     public void closePurchase(long id) {
         Purchase purchase = purchaseMapper.selectByPrimaryKey(id);
-        if("AUDIT".equals(purchase.getPu_statuscode())){
+        if(Status.CLOSE.name().equals(purchase.getPu_statuscode())){
             throw new BizException(BizExceptionCode.BIZ_CLOSE);
         }
         purchase = new Purchase();
         purchase.setId(id);
-        purchase.setPu_acceptstatuscode("CLOSED");
-        purchase.setPu_acceptstatus("已关闭");
+        purchase.setPu_acceptstatuscode(Status.CLOSE.name());
+        purchase.setPu_acceptstatus(Status.CLOSE.getDisplay());
         purchaseMapper.updateByPrimaryKeySelective(purchase);
         DocBaseDTO docBaseDTO = getBaseDTOById(id);
         //日志
@@ -270,7 +271,7 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
     @Override
     public void openPurchase(long id) {
         Purchase purchase = purchaseMapper.selectByPrimaryKey(id);
-        if(!"CLOSED".equals(purchase.getPu_acceptstatuscode())){
+        if(!Status.CLOSE.name().equals(purchase.getPu_acceptstatuscode())){
             throw new BizException(BizExceptionCode.BIZ_OPEN);
         }
         List<PurchaseDetail> purchaseDetailList = purchasedetailMapper.selectByFK(id);