快递100集成

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

@@ -62,9 +62,9 @@ public class StockJournal extends BaseEntity {
     private BigDecimal actualQuantity;
 
     /**
-     * 是否已入库：0、否；1、是
+     * 是否质检：0、否；1、是
      */
-    private Integer isInStock;
+    private Integer isQuality;
 
     /**
      * 备注

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

@@ -92,7 +92,12 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
 
             if (typeEnum instanceof InTypeEnum) {
                 switch ((InTypeEnum) typeEnum) {
-
+                    case PURCHASE:
+                        code = CodeEnum.IN_PURCHASE.getCode();
+                        break;
+                    case MANUAL:
+                        code = CodeEnum.IN_JOURNAL.getCode();
+                        break;
                 }
             } else {
                 switch ((OutTypeEnum) typeEnum) {
@@ -134,7 +139,7 @@ public class StockJournalServiceImpl extends ServiceImpl<StockJournalMapper, Sto
                     stockJournal.setType(StockJournalTypeConstant.IN);
                     stockJournal.setDetailsType(((InTypeEnum) typeEnum).getKey());
                     stockJournal.setActualQuantity(BigDecimal.ZERO);
-                    stockJournal.setIsInStock(StatusConstant.NO);
+                    stockJournal.setIsQuality(StatusConstant.NO);
                 } else {
                     stockJournal.setType(StockJournalTypeConstant.OUT);
                     stockJournal.setDetailsType(((OutTypeEnum) typeEnum).getKey());

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

@@ -103,14 +103,14 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
                 stock = new Stock();
                 stock.setWarehouseId(warehouseId);
                 stock.setGoodsId(goodsId);
-                if (typeEnum.equals(InTypeEnum.PURCHASE)) {
+                if (typeEnum.equals(InTypeEnum.PURCHASE) || typeEnum.equals(InTypeEnum.MANUAL)) {
                     stock.setFrozenQuantity(changeQuantity);
                 } else {
                     stock.setQuantity(changeQuantity);
                 }
                 map.put(key, stock);
             } else {
-                if (typeEnum.equals(InTypeEnum.PURCHASE)) {
+                if (typeEnum.equals(InTypeEnum.PURCHASE) || typeEnum.equals(InTypeEnum.MANUAL)) {
                     stock.setFrozenQuantity(stock.getFrozenQuantity().add(changeQuantity));
                 } else {
                     stock.setQuantity(stock.getQuantity().add(changeQuantity));
@@ -133,7 +133,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
 
             changeStock.setId(stock.getId());
             if (typeEnum instanceof InTypeEnum) {
-                if (typeEnum.equals(InTypeEnum.PURCHASE)) {
+                if (typeEnum.equals(InTypeEnum.PURCHASE) || typeEnum.equals(InTypeEnum.MANUAL)) {
                     changeStock.setFrozenQuantity(stock.getFrozenQuantity().add(changeStock.getFrozenQuantity()));
                 } else {
                     changeStock.setQuantity(stock.getQuantity().add(changeStock.getQuantity()));

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

@@ -48,10 +48,12 @@ public enum CodeEnum {
     S_OUT_JOURNAL("SO", "yyyyMM-", "code", 5, StockJournalService.class),
     // 手动入库流水单号
     IN_JOURNAL("I", "yyyyMM-", "code", 5, StockJournalService.class),
-    // 京东入库流水单号
+    // 京东入库流水单号,
     JD_IN_JOURNAL("JDI", "yyyyMM-", "code", 5, StockJournalService.class),
     // 销售入库流水单号
     S_IN_JOURNAL("SI", "yyyyMM-", "code", 5, StockJournalService.class),
+    //采购入库流水单号
+    IN_PURCHASE("POI", "yyyyMM-", "code", 5, StockJournalService.class),
 
     ;