hx-service-api/victoriatourist-api/src/main/java/com/fjhx/constants/logistics/LogisticsConstant.java

@@ -9,13 +9,25 @@ public interface LogisticsConstant {
      * 状态
      */
     class Status {
-        //未完成
+        //未完成 / 未到货
         public static final Integer STATUS_0 = 0;
-        //已完成
+        //已完成 / 已到货
         public static final Integer STATUS_1 = 1;
     }
 
     /**
+     * 入库状态
+     */
+    class InStockStatus {
+        //未入库
+        public static final Integer STATUS_10 = 10;
+        //部分入库
+        public static final Integer STATUS_20 = 20;
+        //已入库
+        public static final Integer STATUS_30 = 30;
+    }
+
+    /**
      * 物流状态（快递100的状态）
      */
     class KD100Status {

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/apply/ApplyPurchase.java

@@ -64,7 +64,7 @@ public class ApplyPurchase extends BaseEntity {
     private Long receiptWarehouseId;
 
     /**
-     * 状态：10、待采购；20、审批中；30、待发货；40、已发货；50、已完成
+     * 状态：10、待采购；20、已驳回；30、采购审批中；40、已采购；50、已完成
      */
     private Integer status;
 

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/logistics/LogisticsInfo.java

@@ -43,11 +43,16 @@ public class LogisticsInfo extends BaseEntity {
     private String code;
 
     /**
-     * 完成状态 1是 0否
+     * 状态：0、未完成 / 未到货；1、已完成 / 已到货
      */
     private Integer status;
 
     /**
+     * 入库状态：10、未入库；20、部分入库；30、已入库
+     */
+    private Integer inStockStatus;
+
+    /**
      * 物流公司编码
      */
     private String logisticsCompanyCode;

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/purchase/Purchase.java

@@ -39,7 +39,7 @@ public class Purchase extends BaseEntity {
     private BigDecimal price;
 
     /**
-     * 状态：10、审批中；20、驳回；30、待发货；40、已发货；50、已完成
+     * 状态：10、审批中；20、驳回；30、未到货；40、部分到货；50、已到货；99、取消
      */
     private Integer status;
 

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、是
+     * 质检状态：10、未质检；20、部分质检；30、已质检
      */
-    private Integer isInStock;
+    private Integer qualityStatus;
 
     /**
      * 备注

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/enums/apply/ApplyPurchaseStatusEnum.java

@@ -12,9 +12,9 @@ import java.util.Map;
  */
 public enum ApplyPurchaseStatusEnum {
     STATUS_10(10, "待采购"),
-    STATUS_20(20, "审批中"),
-    STATUS_30(30, "待发货"),
-    STATUS_40(40, "已发货"),
+    STATUS_20(20, "采购审批中"),
+    STATUS_30(30, "已驳回"),
+    STATUS_40(40, "已采购"),
     STATUS_50(50, "已完成"),
     ;
 

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/enums/purchase/PurchaseStatusEnum.java

@@ -13,9 +13,10 @@ import java.util.Map;
 public enum PurchaseStatusEnum {
     STATUS_10(10, "审批中"),
     STATUS_20(20, "驳回"),
-    STATUS_30(30, "待发货"),
-    STATUS_40(40, "已发货"),
-    STATUS_50(50, "已完成"),
+    STATUS_30(30, "未到货"),
+    STATUS_40(40, "部分到货"),
+    STATUS_50(50, "已到货"),
+    STATUS_99(99, "已取消"),
     ;
 
     private int key;

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/enums/stock/QualityStatusEnum.java

@@ -0,0 +1,58 @@
+package com.fjhx.enums.stock;
+
+import cn.hutool.core.util.ObjectUtil;
+import lombok.Getter;
+import org.springblade.core.tool.utils.StringPool;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author 质检状态枚举
+ */
+@Getter
+public enum QualityStatusEnum {
+    STATUS_10(10, "未质检"),
+    STATUS_20(20, "部分质检"),
+    STATUS_30(30, "已质检"),
+
+    ;
+
+    private final int key;
+
+    private final String value;
+
+    QualityStatusEnum(int key, String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    private static final Map<Integer, QualityStatusEnum> CLASS_MAP = new HashMap<>();
+
+    static {
+        for (QualityStatusEnum value : QualityStatusEnum.values()) {
+            CLASS_MAP.put(value.getKey(), value);
+        }
+    }
+
+    /**
+     * 根据key获取枚举
+     */
+    public static QualityStatusEnum getEnumByKey(Integer type) {
+        return CLASS_MAP.get(type);
+    }
+
+    /**
+     * 通过key获取名称
+     */
+    public static String getValueByKey(Integer key) {
+        QualityStatusEnum inTypeEnum = CLASS_MAP.get(key);
+
+        if (ObjectUtil.isEmpty(inTypeEnum)) {
+            return StringPool.EMPTY;
+        }
+
+        return inTypeEnum.getValue();
+    }
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/controller/logistics/LogisticsInfoController.java

@@ -37,9 +37,15 @@ public class LogisticsInfoController {
         return R.success(result);
     }
 
+    /**
+     * 发货通知
+     *
+     * @param entity
+     * @return
+     */
     @PostMapping("/add")
-    public R add(@RequestBody LogisticsInfoVo logisticsInfoVo) {
-        logisticsInfoService.add(logisticsInfoVo);
+    public R add(@RequestBody LogisticsInfoVo entity) {
+        logisticsInfoService.add(entity);
         return R.success();
     }
 
@@ -61,5 +67,28 @@ public class LogisticsInfoController {
         return R.success(list);
     }
 
+    /**
+     * 查询物流单号下拉款
+     *
+     * @param entity
+     * @return
+     */
+    @PostMapping("/code/select")
+    public R codeSelect(@RequestBody LogisticsInfoVo entity) {
+        return R.success(logisticsInfoService.codeSelectByBusinessId(entity.getBusinessId()));
+    }
+
+    /**
+     * 到货通知
+     *
+     * @param entity
+     * @return
+     */
+    @PostMapping("/arrival/notice")
+    public R arrivalNotice(@RequestBody LogisticsInfoVo entity) {
+        entity.setStatus(LogisticsConstant.Status.STATUS_1);
+        return R.success(logisticsInfoService.updateById(entity));
+    }
+
 }
 

hx-service/victoriatourist/src/main/java/com/fjhx/controller/purchase/PurchaseController.java

@@ -3,6 +3,7 @@ package com.fjhx.controller.purchase;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.entity.apply.ApplyPurchase;
 import com.fjhx.entity.purchase.Purchase;
+import com.fjhx.enums.purchase.PurchaseStatusEnum;
 import com.fjhx.service.purchase.PurchaseService;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,7 +30,19 @@ public class PurchaseController {
     private PurchaseService purchaseService;
 
     /**
-     * 待发货列表
+     * 待采购列表
+     *
+     * @param condition 查询条件
+     * @return
+     */
+    @PostMapping("/stay/purchase/page")
+    public R stayPurchasePage(@RequestBody Map<String, Object> condition) {
+        Page<ApplyPurchase> result = purchaseService.stayPurchasePage(condition);
+        return R.success(result);
+    }
+
+    /**
+     * 已采购列表
      *
      * @param condition 查询条件
      * @return
@@ -41,26 +54,26 @@ public class PurchaseController {
     }
 
     /**
-     * 待采购列表
+     * 取消
      *
-     * @param condition 查询条件
+     * @param entity
      * @return
      */
-    @PostMapping("/stay/purchase/page")
-    public R stayPurchasePage(@RequestBody Map<String, Object> condition) {
-        Page<ApplyPurchase> result = purchaseService.stayPurchasePage(condition);
-        return R.success(result);
+    @PostMapping("/cancel")
+    public R cancel(@RequestBody Purchase entity) {
+        purchaseService.cancelOrEnd(entity.getId(), PurchaseStatusEnum.STATUS_99.getKey());
+        return R.success();
     }
 
     /**
-     * 完成
+     * 结束
      *
      * @param entity
      * @return
      */
-    @PostMapping("/complete")
-    public R complete(@RequestBody Purchase entity) {
-        purchaseService.complete(entity.getId());
+    @PostMapping("/end")
+    public R end(@RequestBody Purchase entity) {
+        purchaseService.cancelOrEnd(entity.getId(), PurchaseStatusEnum.STATUS_50.getKey());
         return R.success();
     }
 }

hx-service/victoriatourist/src/main/java/com/fjhx/controller/stock/PurchaseInStockController.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.Condition;
 import com.fjhx.enums.stock.InTypeEnum;
 import com.fjhx.params.stock.StockChangeVo;
-import com.fjhx.service.apply.ApplyPurchaseService;
 import com.fjhx.service.logistics.LogisticsDetailsService;
 import com.fjhx.service.stock.StockService;
 import org.springblade.core.tool.api.R;
@@ -25,9 +24,6 @@ import java.util.Map;
 public class PurchaseInStockController {
 
     @Autowired
-    private ApplyPurchaseService applyPurchaseService;
-
-    @Autowired
     private LogisticsDetailsService logisticsDetailsService;
 
     @Autowired
@@ -35,7 +31,7 @@ public class PurchaseInStockController {
 
     @PostMapping("/page")
     public R page(@RequestBody Condition condition) {
-        Page<Map<String, Object>> result = applyPurchaseService.applyInPage(condition);
+        Page<Map<String, Object>> result = null;
         return R.success(result);
     }
 

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/apply/ApplyPurchaseMapper.java

@@ -6,8 +6,6 @@ import com.fjhx.entity.apply.ApplyPurchase;
 import com.fjhx.utils.wrapperUtil.IWrapper;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.Map;
-
 /**
  * <p>
  * 申购单 Mapper 接口
@@ -20,6 +18,4 @@ public interface ApplyPurchaseMapper extends BaseMapper<ApplyPurchase> {
 
     Page<ApplyPurchase> getPage(@Param("page") Page<ApplyPurchase> page, @Param("ew") IWrapper<ApplyPurchase> wrapper);
 
-    Page<Map<String, Object>> applyInPage(@Param("page") Page<ApplyPurchase> page, @Param("ew") IWrapper<Object> wrapper);
-
 }

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/apply/ApplyPurchaseMapper.xml

@@ -29,23 +29,4 @@
         ${ew.customSqlSegment}
     </select>
 
-    <select id="applyInPage" resultType="java.util.LinkedHashMap">
-        select ap.id,
-               ap.code,
-               pi.code                             productCode,
-               pi.name                             productName,
-               pi.type                             productType,
-               ap.quantity,
-               ap.receipt_quantity,
-               (ap.quantity - ap.receipt_quantity) not_receipt_quantity,
-               w.name                              warehouse_name,
-               receipt_time,
-               ap.create_user,
-               ap.status
-        from apply_purchase ap
-                 left join product_info pi on ap.goods_id = pi.id
-                 LEFT JOIN warehouse w ON ap.receipt_warehouse_id = w.id
-            ${ew.customSqlSegment}
-    </select>
-
 </mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/service/apply/ApplyPurchaseService.java

@@ -2,7 +2,6 @@ package com.fjhx.service.apply;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.BaseService;
-import com.fjhx.base.Condition;
 import com.fjhx.entity.apply.ApplyPurchase;
 import com.fjhx.params.apply.ApplyPurchaseVo;
 
@@ -28,11 +27,6 @@ public interface ApplyPurchaseService extends BaseService<ApplyPurchase> {
     void delete(ApplyPurchaseVo applyPurchaseVo);
 
     /**
-     * 申购入库分页
-     */
-    Page<Map<String, Object>> applyInPage(Condition condition);
-
-    /**
      * 待采购列表
      *
      * @param condition 查询条件

hx-service/victoriatourist/src/main/java/com/fjhx/service/apply/impl/ApplyPurchaseServiceImpl.java

@@ -2,7 +2,6 @@ package com.fjhx.service.apply.impl;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.base.Condition;
 import com.fjhx.constants.StockJournalTypeConstant;
 import com.fjhx.entity.apply.ApplyPurchase;
 import com.fjhx.entity.product.ProductInfo;
@@ -29,7 +28,12 @@ import org.springframework.stereotype.Service;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -122,35 +126,6 @@ public class ApplyPurchaseServiceImpl extends ServiceImpl<ApplyPurchaseMapper, A
         removeById(applyPurchaseVo.getId());
     }
 
-    /**
-     * 申购入库分页
-     */
-    @Override
-    public Page<Map<String, Object>> applyInPage(Condition condition) {
-        IWrapper<Object> wrapper = IWrapper.getWrapper(condition);
-        wrapper
-                .func(q -> {
-                    Integer status = condition.getStatus();
-                    if (status == null) {
-                        q.in("ap", ApplyPurchase::getStatus,
-                                ApplyPurchaseStatusEnum.STATUS_30.getKey(),
-                                ApplyPurchaseStatusEnum.STATUS_40.getKey(),
-                                ApplyPurchaseStatusEnum.STATUS_50.getKey());
-                    } else {
-                        q.eq("ap", ApplyPurchase::getStatus);
-                    }
-                })
-                .eq("ap", ApplyPurchase::getReceiptWarehouseId, condition.getLong("warehouseId"))
-                .like("ap", ApplyPurchase::getCode)
-                .like("pi", ProductInfo::getName, condition.getStr("productName"))
-                .eq("ap", ApplyPurchase::getCreateUser)
-                .periodTime("ap", ApplyPurchase::getReceiptTime);
-
-        Page<Map<String, Object>> page = baseMapper.applyInPage(createPage(condition), wrapper);
-        UserClientUtil.setUserName(page.getRecords(), "createUser", "createUserName");
-        return page;
-    }
-
     @Override
     public ApplyPurchase getById(Serializable id) {
         ApplyPurchase purchase = super.getById(id);

hx-service/victoriatourist/src/main/java/com/fjhx/service/logistics/LogisticsInfoService.java

@@ -49,4 +49,12 @@ public interface LogisticsInfoService extends BaseService<LogisticsInfo> {
      * @param state 物流状态
      */
     void updateStatusByCode(String code, Integer state);
+
+    /**
+     * 根据业务ID查询物流单号
+     *
+     * @param businessId 业务ID
+     * @return
+     */
+    List<LogisticsInfo> codeSelectByBusinessId(Long businessId);
 }

hx-service/victoriatourist/src/main/java/com/fjhx/service/logistics/impl/LogisticsInfoServiceImpl.java

@@ -62,8 +62,8 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
             KD100Util.subscribe(logisticsInfoVo.getLogisticsCompanyCode(), logisticsInfoVo.getCode());
         }
         logisticsInfoVo.setLogisticsStatus(state);
-
         logisticsInfoVo.setStatus(LogisticsConstant.Status.STATUS_0);
+        logisticsInfoVo.setInStockStatus(LogisticsConstant.InStockStatus.STATUS_10);
         save(logisticsInfoVo);
 
         logisticsInfoVo.getDetails().forEach(o -> {
@@ -127,4 +127,20 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
     public void updateStatusByCode(String code, Integer state) {
         lambdaUpdate().set(LogisticsInfo::getStatus, state).eq(LogisticsInfo::getCode, code).update();
     }
+
+    /**
+     * 根据业务ID查询物流单号
+     *
+     * @param businessId 业务ID
+     * @return
+     */
+    @Override
+    public List<LogisticsInfo> codeSelectByBusinessId(Long businessId) {
+        return lambdaQuery()
+                .select(LogisticsInfo::getId, LogisticsInfo::getCode)
+                .eq(LogisticsInfo::getBusinessType, 1)
+                .eq(LogisticsInfo::getBusinessId, businessId)
+                .eq(LogisticsInfo::getStatus, LogisticsConstant.Status.STATUS_0)
+                .list();
+    }
 }

hx-service/victoriatourist/src/main/java/com/fjhx/service/purchase/PurchaseService.java

@@ -18,20 +18,20 @@ import java.util.Map;
 public interface PurchaseService extends BaseService<Purchase> {
 
     /**
-     * 待发货列表
+     * 待采购列表
      *
      * @param condition 查询条件
      * @return
      */
-    Page<Purchase> getPage(Map<String, Object> condition);
+    Page<ApplyPurchase> stayPurchasePage(Map<String, Object> condition);
 
     /**
-     * 待采购列表
+     * 已采购列表
      *
      * @param condition 查询条件
      * @return
      */
-    Page<ApplyPurchase> stayPurchasePage(Map<String, Object> condition);
+    Page<Purchase> getPage(Map<String, Object> condition);
 
     /**
      * 获取审批详情
@@ -42,9 +42,10 @@ public interface PurchaseService extends BaseService<Purchase> {
     Purchase getFlowDetailsById(Long id);
 
     /**
-     * 完成采购
+     * 取消 或 结束
      *
-     * @param id 采购ID
+     * @param id     采购ID
+     * @param status 采购状态
      */
-    void complete(Long id);
+    void cancelOrEnd(Long id, Integer status);
 }

hx-service/victoriatourist/src/main/java/com/fjhx/service/purchase/impl/PurchaseFlowServiceImpl.java

@@ -79,7 +79,7 @@ public class PurchaseFlowServiceImpl implements PurchaseFlowService {
                         //修改采购状态
                         purchaseService.lambdaUpdate().set(Purchase::getStatus, PurchaseStatusEnum.STATUS_30.getKey()).eq(Purchase::getId, id).update();
                         //修改申购状态
-                        applyPurchaseService.lambdaUpdate().set(ApplyPurchase::getStatus, ApplyPurchaseStatusEnum.STATUS_30.getKey()).eq(ApplyPurchase::getPurchaseId, id).update();
+                        applyPurchaseService.lambdaUpdate().set(ApplyPurchase::getStatus, ApplyPurchaseStatusEnum.STATUS_40.getKey()).eq(ApplyPurchase::getPurchaseId, id).update();
                     }
 
                     /**
@@ -106,10 +106,10 @@ public class PurchaseFlowServiceImpl implements PurchaseFlowService {
                         purchaseService.lambdaUpdate().set(Purchase::getStatus, PurchaseStatusEnum.STATUS_20.getKey()).set(Purchase::getDelFlag, CommonConstant.YesOrNo.YES).eq(Purchase::getId, id).update();
                         //修改申购状态
                         applyPurchaseService.lambdaUpdate()
-                                .set(ApplyPurchase::getStatus, ApplyPurchaseStatusEnum.STATUS_10.getKey())
-                                .set(ApplyPurchase::getUnitPrice, null)
-                                .set(ApplyPurchase::getPurchaseId, null)
-                                .set(ApplyPurchase::getPurchaseCode, null)
+                                .set(ApplyPurchase::getStatus, ApplyPurchaseStatusEnum.STATUS_30.getKey())
+//                                .set(ApplyPurchase::getUnitPrice, null)
+//                                .set(ApplyPurchase::getPurchaseId, null)
+//                                .set(ApplyPurchase::getPurchaseCode, null)
                                 .eq(ApplyPurchase::getPurchaseId, id)
                                 .update();
                         return true;

hx-service/victoriatourist/src/main/java/com/fjhx/service/purchase/impl/PurchaseServiceImpl.java

@@ -41,7 +41,18 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
     private LogisticsInfoService logisticsInfoService;
 
     /**
-     * 待发货列表
+     * 待采购列表
+     *
+     * @param condition 查询条件
+     * @return
+     */
+    @Override
+    public Page<ApplyPurchase> stayPurchasePage(Map<String, Object> condition) {
+        return applyPurchaseService.stayPurchasePage(condition);
+    }
+
+    /**
+     * 已采购列表
      *
      * @param condition 查询条件
      * @return
@@ -82,17 +93,6 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
     }
 
     /**
-     * 待采购列表
-     *
-     * @param condition 查询条件
-     * @return
-     */
-    @Override
-    public Page<ApplyPurchase> stayPurchasePage(Map<String, Object> condition) {
-        return applyPurchaseService.stayPurchasePage(condition);
-    }
-
-    /**
      * 获取审批详情
      *
      * @param id 采购ID
@@ -112,15 +112,16 @@ public class PurchaseServiceImpl extends ServiceImpl<PurchaseMapper, Purchase> i
     }
 
     /**
-     * 完成采购
+     * 取消 或 结束
      *
-     * @param id 采购ID
+     * @param id     采购ID
+     * @param status 采购状态
      */
     @Transactional(rollbackFor = {Exception.class})
     @Override
-    public void complete(Long id) {
+    public void cancelOrEnd(Long id, Integer status) {
         //修改采购状态
-        lambdaUpdate().set(Purchase::getStatus, PurchaseStatusEnum.STATUS_50.getKey()).eq(Purchase::getId, id).update();
+        lambdaUpdate().set(Purchase::getStatus, status).eq(Purchase::getId, id).update();
         //修改申购状态
         applyPurchaseService.lambdaUpdate().set(ApplyPurchase::getStatus, ApplyPurchaseStatusEnum.STATUS_50.getKey()).eq(ApplyPurchase::getPurchaseId, id).update();
     }

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

@@ -4,11 +4,11 @@ import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.base.Condition;
-import com.fjhx.constants.StatusConstant;
 import com.fjhx.constants.StockJournalTypeConstant;
 import com.fjhx.entity.stock.StockJournal;
 import com.fjhx.enums.stock.InTypeEnum;
 import com.fjhx.enums.stock.OutTypeEnum;
+import com.fjhx.enums.stock.QualityStatusEnum;
 import com.fjhx.mapper.stock.StockJournalMapper;
 import com.fjhx.params.stock.StockChangeVo;
 import com.fjhx.params.stock.StockJournalVo;
@@ -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.setQualityStatus(QualityStatusEnum.STATUS_10.getKey());
                 } else {
                     stockJournal.setType(StockJournalTypeConstant.OUT);
                     stockJournal.setDetailsType(((OutTypeEnum) typeEnum).getKey());

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

@@ -18,7 +18,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>
@@ -34,9 +38,6 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Autowired
     private StockJournalServiceImpl stockJournalService;
 
-    // 添加流水记录锁
-    public static final Object ADD_JOURNAL_LOCK = new Object();
-
     @Override
     public Page<Stock> getPage(Map<String, Object> condition) {
 

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),
 
     ;