维多利亚

hx-service-api/syringe-management-api/src/main/java/com/fjhx/params/production/ProductionLineVo.java

@@ -1,12 +1,9 @@
 package com.fjhx.params.production;
 
-import com.fjhx.entity.FileInfo;
 import com.fjhx.entity.production.ProductionLine;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.List;
-
 /**
  * 生产线
  *
@@ -17,9 +14,4 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 public class ProductionLineVo extends ProductionLine {
 
-    /**
-     * 文件信息
-     */
-    private List<FileInfo> fileInfoList;
-
 }

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

@@ -15,6 +15,7 @@ public enum InTypeEnum {
     // business_id = logistics_details 表 id
     PURCHASE(1, "采购入库"),
 
+    // business_id = 自定义id
     MANUAL(2, "手动入库"),
 
     TRANSFER(7, "调仓入库"),

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

@@ -15,20 +15,29 @@ import java.util.Map;
 @Getter
 public enum OutTypeEnum {
 
+    // business_id = order_id 表 id
     PURCHASE(1, "采购订单出库"),
 
+    // business_id = order_id 表 id
     JD(2, "京东订单出库"),
 
     // ======== 手动出库明细 ========
+
+    // business_id = 自定义id
     PICKING(3, "领料出库"),
 
+    // business_id = 自定义id
     SALE(4, "销售出库"),
 
+    // business_id = 自定义id
     RETURN_GOODS(5, "退货出库"),
 
+    // business_id = 自定义id
     SCRAP(6, "报废出库"),
+
     // ======== 手动出库明细 ========
 
+    // business_id = 自定义id
     TRANSFER(7, "调仓出库"),
 
     // business_id = quality_details 表 id

hx-service/syringe-management/src/main/java/com/fjhx/service/production/impl/ProductionLineServiceImpl.java

@@ -3,20 +3,15 @@ package com.fjhx.service.production.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fjhx.base.BaseIdEntity;
-import com.fjhx.entity.FileInfo;
 import com.fjhx.entity.production.ProductionLine;
 import com.fjhx.mapper.production.ProductionLineMapper;
 import com.fjhx.params.production.ProductionLineEx;
 import com.fjhx.params.production.ProductionLineVo;
 import com.fjhx.service.production.ProductionLineService;
-import com.fjhx.utils.FileClientUtil;
 import com.fjhx.utils.WrapperUtil;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -37,40 +32,23 @@ public class ProductionLineServiceImpl extends ServiceImpl<ProductionLineMapper,
                 .keyword("pl.name") // 生产线名称
                 .createTimeDesc("pl")
                 .getWrapper();
-        Page<ProductionLineEx> page = baseMapper.getPage(createPage(condition), wrapper);
 
-        List<ProductionLineEx> records = page.getRecords();
-        if (records.size() == 0) {
-            return page;
-        }
-
-        List<Long> productionLineIdList = records.stream().map(BaseIdEntity::getId).collect(Collectors.toList());
-
-        Map<Long, List<FileInfo>> fileInfoListMap = FileClientUtil.getFileInfoListMap(productionLineIdList);
-        for (ProductionLineEx productionLineEx : records) {
-            productionLineEx.setFileInfoList(fileInfoListMap.get(productionLineEx.getId()));
-        }
-
-        return page;
+        return baseMapper.getPage(createPage(condition), wrapper);
     }
 
     @Override
     public void add(ProductionLineVo productionLineVo) {
         save(productionLineVo);
-        FileClientUtil.bindingFile(productionLineVo.getId(), productionLineVo.getFileInfoList());
     }
 
     @Override
     public void edit(ProductionLineVo productionLineVo) {
         updateById(productionLineVo);
-        FileClientUtil.againBindingFile(productionLineVo.getId(), productionLineVo.getFileInfoList());
     }
 
     @Override
     public void delete(ProductionLineVo productionLineVo) {
         removeById(productionLineVo.getId());
-        FileClientUtil.relieveBindingFile(productionLineVo.getId());
-
     }
 
 }

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

@@ -1,5 +1,6 @@
 package com.fjhx.controller.stock;
 
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.Condition;
 import com.fjhx.entity.stock.StockJournal;
@@ -43,6 +44,7 @@ public class ManualInStockController {
     @PostMapping("/add")
     public R add(@RequestBody ManualInStockVo entity) {
         StockChangeDto stockChangeDto = new StockChangeDto();
+        stockChangeDto.setDefaultBusinessId(IdWorker.getId());
         stockChangeDto.setDefaultWarehouseId(entity.getWarehouseId());
         stockChangeDto.setDefaultRemarks(entity.getRemarks());
         stockChangeDto.setTypeEnum(InTypeEnum.MANUAL);

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

@@ -1,5 +1,6 @@
 package com.fjhx.controller.stock;
 
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.base.Condition;
 import com.fjhx.entity.stock.ManualVo;
@@ -32,6 +33,7 @@ public class ManualOutStockController {
     @PostMapping("/add")
     public R add(@RequestBody ManualVo manualVo) {
         StockChangeDto stockChangeDto = new StockChangeDto();
+        stockChangeDto.setDefaultBusinessId(IdWorker.getId());
         stockChangeDto.setDefaultWarehouseId(manualVo.getWarehouseId());
         stockChangeDto.setDefaultRemarks(manualVo.getRemarks());
         stockChangeDto.setTypeEnum(OutTypeEnum.getEnumByKey(manualVo.getType()));

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

@@ -334,8 +334,10 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
         Long logisticsInfoId = inStockAdd.getLogisticsInfoId();
 
         StockChangeDto stockChangeDto = new StockChangeDto();
+        stockChangeDto.setDefaultRemarks("采购入库");
         stockChangeDto.setTypeEnum(InTypeEnum.PURCHASE);
         stockChangeDto.setChangeDetailsList(list);
+
         List<StockJournal> stockJournals = stockService.changeQuantity(stockChangeDto);
 
         // 修改入库数量

hx-service/victoriatourist/src/main/java/com/fjhx/service/order/impl/OrderDetailsServiceImpl.java

@@ -192,17 +192,11 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
         stockChangeDto.setDefaultWarehouseId(issueVo.getWarehouseId());
         stockChangeDto.setTypeEnum(issueVo.getOutTypeEnum());
         stockChangeDto.setChangeDetailsList(orderDetailsList);
+        stockService.changeQuantity(stockChangeDto);
 
         // 京东出库新增调仓
         if (issueVo.getOutTypeEnum().equals(OutTypeEnum.JD)) {
             // 获取京东仓库id
-            Long jdWarehouseId = systemConfigService.getValue(SystemConfigKeyConstant.JD_WAREHOUSE_ID, Long.class);
-
-            StockTransferAddVo stockTransferAddVo = new StockTransferAddVo();
-            stockTransferAddVo.setOutWarehouseId(issueVo.getWarehouseId());
-            stockTransferAddVo.setInWarehouseId(jdWarehouseId);
-            stockTransferAddVo.setRemark("京东出库");
-            // ChangeProduct.
 
             List<ChangeProduct> changeProductList = issueVo.getOrderDetailsList().stream().map(item -> {
                 ChangeProduct changeProduct = new ChangeProduct();
@@ -211,11 +205,14 @@ public class OrderDetailsServiceImpl extends ServiceImpl<OrderDetailsMapper, Ord
                 return changeProduct;
             }).collect(Collectors.toList());
 
+            StockTransferAddVo stockTransferAddVo = new StockTransferAddVo();
+            stockTransferAddVo.setOutWarehouseId(issueVo.getWarehouseId());
+            stockTransferAddVo.setInWarehouseId(systemConfigService.getValue(SystemConfigKeyConstant.JD_WAREHOUSE_ID, Long.class));
+            stockTransferAddVo.setRemark("京东出库");
             stockTransferAddVo.setChangeProductList(changeProductList);
             stockTransferService.add(stockTransferAddVo);
         }
 
-        stockService.changeQuantity(stockChangeDto);
     }
 
 }

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

@@ -88,6 +88,7 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         List<StockTransfer> stockTransferList = changeProductList.stream()
                 // 排除调仓数量为0
                 .filter(item -> item.getQuantity().compareTo(BigDecimal.ZERO) > 0)
+
                 .map(item -> {
                     long id = IdWorker.getId();
                     StockTransfer stockTransfer = new StockTransfer();
@@ -112,6 +113,7 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
         }
 
         StockChangeDto stockChangeDto = new StockChangeDto();
+        stockChangeDto.setDefaultBusinessId(IdWorker.getId());
         stockChangeDto.setDefaultWarehouseId(stockTransferAddVo.getOutWarehouseId());
         stockChangeDto.setDefaultRemarks(stockTransferAddVo.getRemark());
         stockChangeDto.setTypeEnum(OutTypeEnum.TRANSFER);