已上传B2B的采购单不允许反审核

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

@@ -338,6 +338,13 @@ public class PurchaseServiceImpl extends CommonBaseServiceImpl<PurchaseMapper, P
 
     @Override
     public void unAudit(Long id) {
+        boolean enable = ConfigsCache.current().enableB2B();
+        if (enable){
+            Purchase purchase = purchaseMapper.selectByPrimaryKey(id);
+            if ("已上传".equals(purchase.getB2bStatus())){
+                throw new BizException(BizExceptionCode.PURCHASE_ORDER_HASUPLOAD);
+            }
+        }
         if (null == id) {
             return;
         }

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

@@ -38,6 +38,7 @@
     <result column="pu_text5" property="pu_text5" jdbcType="VARCHAR" />
     <result column="pu_currency" property="pu_currency" jdbcType="VARCHAR" />
     <result column="pu_rate" property="pu_rate" jdbcType="DOUBLE" />
+    <result column="b2bStatus" property="b2bStatus" jdbcType="VARCHAR" />
   </resultMap>
  <resultMap id="ResultMapWithBLOBs" type="com.usoftchina.saas.purchase.po.Purchase" extends="BaseResultMap" >
     <result column="PU_SHIPADDRESSCODE" property="pu_shipaddresscode" jdbcType="LONGVARCHAR" />
@@ -48,7 +49,7 @@
     PU_BUYERNAME, PU_DELIVERY, PU_TAXTOTAL, PU_TOTAL, PU_REMARK, PU_TOTALUPPER,
     PU_PRINTSTATUS, PU_PRINTSTATUSCODE, PU_ACCEPTSTATUSCODE, PU_ACCEPTSTATUS, PU_STATUSCODE, 
     PU_STATUS, companyid, updaterId,updaterName,updateTime,creatorid,creatorName,createtime, pu_text1, pu_text2, pu_text3, pu_text4,
-    pu_text5,pu_auditman,pu_auditdate,pu_currency,pu_rate
+    pu_text5,pu_auditman,pu_auditdate,pu_currency,pu_rate,b2bStatus
   </sql>
   <sql id="Blob_Column_List" >
     PU_SHIPADDRESSCODE

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

@@ -21,7 +21,7 @@ import com.usoftchina.saas.context.BaseContextHolder;
 import com.usoftchina.saas.exception.BizException;
 import com.usoftchina.saas.page.PageDefault;
 import com.usoftchina.saas.page.PageRequest;
-import com.usoftchina.saas.purchase.api.PurchaseService;
+import com.usoftchina.saas.purchase.api.PurchaseApi;
 import com.usoftchina.saas.sale.dto.*;
 import com.usoftchina.saas.sale.mapper.*;
 import com.usoftchina.saas.sale.po.Sale;
@@ -68,7 +68,7 @@ public class SaleServiceImpl implements SaleService{
     @Autowired
     private CommonService commonService;
     @Autowired
-    private PurchaseService purchaseService;
+    private PurchaseApi purchaseApi;
     @Autowired
     private InquiryApi inquiryApi;
     @Autowired
@@ -617,7 +617,7 @@ public class SaleServiceImpl implements SaleService{
        // Result<String> result = maxnumberService.getMaxnumber(BillCodeSeq.PURCHASE.getCaller(),false);
         baseDTO.setId(0l);
         baseDTO.setName(BillCodeSeq.PURCHASE.getCaller());
-        String result = purchaseService.getPurchaseCode(baseDTO);
+        String result = purchaseApi.getPurchaseCode(baseDTO);
         purchase.setPu_code(result);
         purchase.setPu_status(Status.UNAUDITED.getDisplay());
         purchase.setPu_statuscode(Status.UNAUDITED.toString());