维多利亚

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/stock/StockJournal.java

@@ -57,16 +57,6 @@ public class StockJournal extends BaseEntity {
     private BigDecimal changeQuantity;
 
     /**
-     * 实际入库数量
-     */
-    private BigDecimal actualQuantity;
-
-    // /**
-    //  * 质检状态：10、未质检；20、部分质检；30、已质检
-    //  */
-    // private Integer qualityStatus;
-
-    /**
      * 出入库金额
      */
     private BigDecimal amount;

hx-service/victoriatourist/src/main/java/com/fjhx/service/stock/impl/StockJournalServiceImpl.java

@@ -121,6 +121,10 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
                         break;
                     case JD:
                         code = CodeEnum.JD_OUT_JOURNAL.getCode();
+                        break;
+                    case UNQUALIFIED_QUALITY_INSPECTION:
+                        code = CodeEnum.BS.getCode();
+                        break;
                 }
             }
 
@@ -153,7 +157,6 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
                 if (typeEnum instanceof InTypeEnum) {
                     stockJournal.setType(StockJournalTypeConstant.IN);
                     stockJournal.setDetailsType(((InTypeEnum) typeEnum).getKey());
-                    stockJournal.setActualQuantity(BigDecimal.ZERO);
                 } else {
                     stockJournal.setType(StockJournalTypeConstant.OUT);
                     stockJournal.setDetailsType(((OutTypeEnum) typeEnum).getKey());

hx-service/victoriatourist/src/main/java/com/fjhx/uitl/code/CodeEnum.java

@@ -45,12 +45,16 @@ public enum CodeEnum {
     ORDER_SALES("SO", null, "code", 5, OrderInfoService.class),
     // 京东订单
     ORDER_JD("JD", null, "code", 5, OrderInfoService.class),
+
     // 手动出库流水单号
     OUT_JOURNAL("O", "yyyyMM-", "code", 5, StockJournalService.class),
     // 京东出库流水单号
     JD_OUT_JOURNAL("JDO", "yyyyMM-", "code", 5, StockJournalService.class),
     // 销售出库流水单号
     S_OUT_JOURNAL("SO", "yyyyMM-", "code", 5, StockJournalService.class),
+    // 质检不合格出库单
+    BS("BS", "yyyyMM-", "code", 5, StockJournalService.class),
+
     // 手动入库流水单号
     IN_JOURNAL("I", "yyyyMM-", "code", 5, StockJournalService.class),
     // 京东入库流水单号,
@@ -59,6 +63,7 @@ public enum CodeEnum {
     S_IN_JOURNAL("SI", "yyyyMM-", "code", 5, StockJournalService.class),
     // 采购入库流水单号
     IN_PURCHASE("POI", "yyyyMM-", "code", 5, StockJournalService.class),
+
     // 盘点单号
     CHECK_CODE("CK", "yyyyMM-", "code", 5, CheckInfoService.class),
     // 报溢单号
@@ -67,7 +72,6 @@ public enum CodeEnum {
     FORM_LOSS("FL", "yyyyMM-", "code", 5, FormOverflowLossService.class),
     // 质检单号
     QUALITY("QA", "yyyyMM-", "code", 5, QualityInfoService.class),
-
     ;
 
     CodeEnum(String prefix, String dateFormat, String codeFieldName, Integer length, Class<? extends IService<?>> serviceCls) {