Merge remote-tracking branch 'origin/master'

hx-mes/src/main/java/com/fjhx/mes/service/border/impl/BorderOfLineServiceImpl.java

@@ -16,6 +16,7 @@ import com.fjhx.mes.entity.border.vo.BorderOfLineVo;
 import com.fjhx.mes.mapper.border.BorderOfLineMapper;
 import com.fjhx.mes.service.border.BorderOfLineJournalService;
 import com.fjhx.mes.service.border.BorderOfLineService;
+import com.fjhx.wms.entity.stock.emums.StockWaitType;
 import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.service.stock.StockWaitDetailsService;
@@ -163,7 +164,7 @@ public class BorderOfLineServiceImpl extends ServiceImpl<BorderOfLineMapper, Bor
         if (borderOfLineDto.getType() == 2) {
             StockWait stockWait = new StockWait();
             stockWait.setType(1);
-            stockWait.setBusinessType(1);
+            stockWait.setBusinessType(StockWaitType.BORDER_OF_LINE_IN.getDetailType());
             stockWait.setBusinessId(borderOfLineJournal.getId());
             stockWait.setStatus(0);
             stockWaitService.save(stockWait);

hx-mes/src/main/java/com/fjhx/mes/service/completion/impl/CompletionInfoServiceImpl.java

@@ -19,6 +19,7 @@ import com.fjhx.mes.service.completion.CompletionInfoService;
 import com.fjhx.mes.service.production.ProductionPlanService;
 import com.fjhx.mes.service.production.ProductionTaskService;
 import com.fjhx.mes.service.work.WorkOrderService;
+import com.fjhx.wms.entity.stock.emums.StockWaitType;
 import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.service.stock.StockWaitDetailsService;
@@ -113,7 +114,7 @@ public class CompletionInfoServiceImpl extends ServiceImpl<CompletionInfoMapper,
         //添加一条完工入库类型的待入库数据
         StockWait stockWait = new StockWait();
         stockWait.setType(1);
-        stockWait.setBusinessType(2);
+        stockWait.setBusinessType(StockWaitType.COMPLETION_IN.getDetailType());
         stockWait.setBusinessId(completionInfoDto.getId());
         stockWait.setStatus(0);
         stockWaitService.save(stockWait);

hx-purchase/src/main/java/com/fjhx/purchase/flow/SalesReturnFlow.java

@@ -15,6 +15,7 @@ import com.fjhx.purchase.entity.sales.po.SalesReturnDetail;
 import com.fjhx.purchase.service.sales.SalesReturnDetailService;
 import com.fjhx.purchase.service.sales.SalesReturnService;
 import com.fjhx.purchase.util.code.CodeEnum;
+import com.fjhx.wms.entity.stock.emums.StockWaitType;
 import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.service.stock.StockWaitDetailsService;
@@ -103,7 +104,7 @@ public class SalesReturnFlow extends FlowDelegate {
         stockWait.setBusinessId(businessId);
         stockWait.setType(2);//入库
         stockWait.setStatus(0);//待入库
-        stockWait.setBusinessType(4);//退货出库
+        stockWait.setBusinessType(StockWaitType.BACK_OUT.getDetailType());//退货出库
         stockWaitService.save(stockWait);
         List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
         for (SalesReturnDetail s : salesReturnDetailList) {

hx-purchase/src/main/java/com/fjhx/purchase/service/arrival/impl/ArrivalServiceImpl.java

@@ -32,6 +32,7 @@ import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.fjhx.purchase.service.subscribe.SubscribeDetailService;
 import com.fjhx.purchase.service.subscribe.SubscribeService;
 import com.fjhx.purchase.util.code.CodeEnum;
+import com.fjhx.wms.entity.stock.emums.StockWaitType;
 import com.fjhx.wms.entity.stock.po.StockWait;
 import com.fjhx.wms.entity.stock.po.StockWaitDetails;
 import com.fjhx.wms.service.stock.StockWaitDetailsService;
@@ -119,7 +120,7 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
             stockWait.setBusinessId(arrival.getId());//到货明细ID
             stockWait.setType(1);//入库
             stockWait.setStatus(0);//待入库
-            stockWait.setBusinessType(3);//采购到货
+            stockWait.setBusinessType(StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType());//采购到货
             stockWaitService.save(stockWait);
             List<StockWaitDetails> stockWaitDetailsList = new ArrayList<>();
             for (ArrivalDetail d : arrivalDetailList) {
@@ -187,7 +188,7 @@ public class ArrivalServiceImpl extends ServiceImpl<ArrivalMapper, Arrival> impl
         StockWait stockWait = new StockWait();
         stockWait.setType(1);//入库
         stockWait.setStatus(0);//待入库
-        stockWait.setBusinessType(3);//采购到货
+        stockWait.setBusinessType(StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType());//采购到货
         //将业务id设置成到货id
         stockWait.setBusinessId(arrival.getId());
         stockWait.setVictoriatouristJson(json.toJSONString());

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

@@ -21,6 +21,7 @@ import com.fjhx.victoriatourist.service.abnormal.AbnormalInfoService;
 import com.fjhx.victoriatourist.service.stock.StockTransferDetailsService;
 import com.fjhx.victoriatourist.service.stock.StockTransferService;
 import com.fjhx.victoriatourist.utils.CodeEnum;
+import com.fjhx.wms.entity.stock.emums.JournalType;
 import com.fjhx.wms.entity.stock.po.Stock;
 import com.fjhx.wms.entity.stock.po.StockJournal;
 import com.fjhx.wms.entity.stock.po.StockJournalDetails;
@@ -169,22 +170,36 @@ public class StockTransferServiceImpl extends ServiceImpl<StockTransferMapper, S
             }
         }
         updateById(stockTransfer);
-        //创建出入库记录
+        //创建入库记录
         StockJournal stockJournal = new StockJournal();
-        stockJournal.setType(3);
+        stockJournal.setOpType(1);
+        stockJournal.setType(JournalType.ADJUSTING_IN.getDetailType());
         stockJournal.setCode(CodeEnum.STOCK_TRANSFER.getCode());
         stockJournal.setWarehouseId(stockTransfer.getOutWarehouseId());
         stockJournal.setToWarehouseId(stockTransfer.getInWarehouseId());
         stockJournal.setBusinessId(stockTransfer.getId());
-        //保存出入库记录
+        //保存人库记录
         stockJournalService.save(stockJournal);
+
+        //创建出库记录
+        StockJournal stockJournal1 = new StockJournal();
+        stockJournal1.setOpType(2);
+        stockJournal1.setType(JournalType.ADJUSTING_OUT.getDetailType());
+        stockJournal1.setCode(CodeEnum.STOCK_TRANSFER.getCode());
+        stockJournal1.setWarehouseId(stockTransfer.getOutWarehouseId());
+        stockJournal1.setToWarehouseId(stockTransfer.getInWarehouseId());
+        stockJournal1.setBusinessId(stockTransfer.getId());
+        //保存出库记录
+        stockJournalService.save(stockJournal1);
         if(ObjectUtil.isNotEmpty(stockList)) {
             //出库
-            stockService.ModifyInventory(stockJournal.getId(), 2, stockList, stockTransfer.getOutWarehouseId());
+            List<StockJournalDetails> stockJournalDetailsList1 = stockService.ModifyInventory(stockJournal1.getId(), 2, stockList, stockTransfer.getOutWarehouseId());
             //入库
             List<StockJournalDetails> stockJournalDetailsList = stockService.ModifyInventory(stockJournal.getId(), 1, stockList, stockTransfer.getInWarehouseId());
             //保存出入库记录明细
             stockJournalDetailsService.saveBatch(stockJournalDetailsList);
+            stockJournalDetailsService.saveBatch(stockJournalDetailsList1);
+
         }
     }
 

hx-wms/src/main/java/com/fjhx/wms/entity/stock/dto/StockJournalSelectDto.java

@@ -17,6 +17,9 @@ public class StockJournalSelectDto extends BaseSelectDto {
     /**记录类型 1为手动入库 2为手动出库*/
     private String type;
 
+    /**操作类型 1入库 2出库*/
+    private String opType;
+
     /**仓库id*/
     private String warehouseId;
 

hx-wms/src/main/java/com/fjhx/wms/entity/stock/emums/InOutType.java

@@ -11,10 +11,4 @@ public enum InOutType {
      * 出库
      */
     OUT,
-
-    /**
-     * 调仓
-     */
-    ADJUSTING
-
 }

hx-wms/src/main/java/com/fjhx/wms/entity/stock/emums/JournalType.java

@@ -6,18 +6,27 @@ import lombok.Getter;
 @AllArgsConstructor
 @Getter
 public enum JournalType {
-    //    操作类型 1手动入库 2手动出库 3调仓 4待入库入库 5待出库出库
-
     MANUAL_IN(InOutType.IN, 1, "手动入库", ""),
     MANUAL_OUT(InOutType.OUT, 2, "手动出库", ""),
-    ADJUSTING(InOutType.ADJUSTING, 3, "调仓", ""),
+    ADJUSTING_IN(InOutType.IN, 3, "调仓入库", ""),
     STOCK_WAIT_IN(InOutType.IN, 4, "待入库入库", "stock_wait"),
-    STOCK_WAIT_OUT(InOutType.OUT, 5, "待出库入库", "stock_wait"),
+    STOCK_WAIT_OUT(InOutType.OUT, 5, "待出库出库", "stock_wait"),
     COMBINATION_IN(InOutType.IN, 6, "组合入库", "group_record_details"),
     COMBINATION_OUT(InOutType.OUT, 7, "组合出库", "group_record_details"),
     SPLIT_IN(InOutType.IN, 8, "组合拆分入库", "group_record_details"),
     SPLIT_OUT(InOutType.OUT, 9, "组合拆分出库", "group_record_details"),
     JD_SALES_OUT(InOutType.OUT, 10, "京东销售出库", "sales_record"),
+    ADJUSTING_OUT(InOutType.OUT, 11, "调仓出库", ""),
+    SALES_OUT(InOutType.OUT, 12, "销售订单出库", ""),
+    BACK_OUT(InOutType.OUT, 13, "待出库 退货出库", ""),
+    ARRIVAL_IN(InOutType.IN, 14, "到货入库", ""),
+    JD_BACK_IN(InOutType.IN, 15, "京东退货入库", ""),
+
+
+    BORDER_OF_LINE_IN(InOutType.IN, 16, "待入库 线边回仓", ""),
+    COMPLETION_IN(InOutType.IN, 17, "待入库 完工入库", ""),
+    PURCHASE_ARRIVAL_IN(InOutType.IN, 18, "待入库 采购到货", ""),
+    ;
 
     ;
 

hx-wms/src/main/java/com/fjhx/wms/entity/stock/emums/StockWaitType.java

@@ -0,0 +1,37 @@
+package com.fjhx.wms.entity.stock.emums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@AllArgsConstructor
+@Getter
+public enum StockWaitType {
+
+    BORDER_OF_LINE_IN(InOutType.IN, 1, "线边回仓", ""),
+    COMPLETION_IN(InOutType.IN, 2, "完工入库", ""),
+    PURCHASE_ARRIVAL_IN(InOutType.IN, 3, "采购到货", ""),
+    BACK_OUT(InOutType.OUT, 4, "退货出库", ""),
+    ;
+
+
+    /**
+     * 出入库类型
+     */
+    private final InOutType type;
+
+    /**
+     * 详细类型
+     */
+    private final Integer detailType;
+
+    /**
+     * 信息类型说明
+     */
+    private final String detailTypeRemark;
+
+    /**
+     * 关联业务表名
+     */
+    private final String linkBusinessTableName;
+
+}

hx-wms/src/main/java/com/fjhx/wms/entity/stock/po/StockJournal.java

@@ -27,11 +27,16 @@ public class StockJournal extends BasePo {
     private String code;
 
     /**
-     * 操作类型 1手动入库
+     * 业务类型 1手动入库
      */
     private Integer type;
 
     /**
+     * 操作类型
+     */
+    private Integer opType;
+
+    /**
      * 仓库id
      */
     private Long warehouseId;

hx-wms/src/main/java/com/fjhx/wms/entity/stock/vo/StockJournalDetailsVo.java

@@ -7,20 +7,55 @@ import lombok.Setter;
 /**
  * 出入库记录明细列表查询返回值实体
  *
- * @author 
+ * @author
  * @since 2023-03-20
  */
 @Getter
 @Setter
 public class StockJournalDetailsVo extends StockJournalDetails {
 
-    /**商品名称*/
+    /**
+     * 商品名称
+     */
     private String productName;
 
-    /**仓库名称*/
+    /**
+     * 仓库名称
+     */
     private String warehouseName;
 
-    /**操作类型*/
+    /**
+     * 操作类型
+     */
     private Integer type;
 
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
+    /**
+     * 产品单位
+     */
+    private String productUnit;
+
+    /**
+     * 产品类型
+     */
+    private Integer productType;
+    /**
+     * 产品规格
+     */
+    private String productSpec;
+
+    /**
+     * 操作类型
+     */
+    private Integer opType;
+
+    /**
+     * 操作人名称
+     */
+    private String opUserName;
+
 }

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockJournalDetailsServiceImpl.java

@@ -12,6 +12,7 @@ import com.fjhx.wms.service.stock.StockJournalDetailsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.wms.entity.stock.dto.StockJournalDetailsDto;
 import com.fjhx.wms.entity.stock.dto.StockJournalDetailsSelectDto;
+import com.ruoyi.system.utils.UserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -40,24 +41,23 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
     @Override
     public Page<StockJournalDetailsVo> getPage(StockJournalSelectDto dto) {
         IWrapper<StockJournalDetails> wrapper = getWrapper();
+        wrapper.eq("sj.op_type",dto.getOpType());
         wrapper.eq("sj.type",dto.getType());
         wrapper.like("w.name",dto.getKeyword());
         wrapper.eq("w.id",dto.getWarehouseId());
         wrapper.eq("sjd.product_id",dto.getProductId());
         Page<StockJournalDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockJournalDetailsVo> records = page.getRecords();
-        //获取商品id列表
-        List<Long> productIds = records.stream().map(StockJournalDetailsVo::getProductId).collect(Collectors.toList());
-        if(ObjectUtil.isNotEmpty(productIds)) {
-            List<ProductInfo> productInfos = productInfoService.listByIds(productIds);
-            Map<Long, ProductInfo> productInfoMap = productInfos.stream().collect(Collectors.groupingBy(ProductInfo::getId,
-                    Collectors.collectingAndThen(Collectors.toList(), value -> value.get(0))));
-            for (StockJournalDetailsVo stockJournalVo : records) {
-                ProductInfo productInfo = productInfoMap.get(stockJournalVo.getProductId());
-                stockJournalVo.setProductName(productInfo.getName());
-            }
-        }
-
+        // 赋值产品属性
+        productInfoService.attributeAssign(records, StockJournalDetailsVo::getProductId, (item, product) -> {
+            item.setProductCode(product.getCode());
+            item.setProductUnit(product.getUnit());
+            item.setProductType(product.getType());
+            item.setProductName(product.getName());
+            item.setProductSpec(product.getSpec());
+        });
+        //赋值操作人名称
+        UserUtil.assignmentNickName(records,StockJournalDetailsVo::getCreateUser,StockJournalDetailsVo::setOpUserName);
         return page;
     }
 

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

@@ -172,6 +172,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     public void add(StockDto stockDto) {
         //创建出入库记录
         StockJournal stockJournal = new StockJournal();
+        stockJournal.setOpType(stockDto.getType());
         stockJournal.setType(stockDto.getType());
         stockJournal.setCode(stockDto.getType()==1? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
         stockJournal.setWarehouseId(stockDto.getWarehouseId());
@@ -189,6 +190,7 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     public void edit(StockDto stockDto) {
         //创建出入库记录
         StockJournal stockJournal = new StockJournal();
+        stockJournal.setOpType(stockDto.getType());
         stockJournal.setCode(stockDto.getType()==1? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
         stockJournal.setType(stockDto.getType());
         stockJournal.setWarehouseId(stockDto.getWarehouseId());
@@ -204,19 +206,34 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void stockTransfer(StockDto stockDto) {
-        //创建出入库记录
+        //创建出库记录
         StockJournal stockJournal = new StockJournal();
         stockJournal.setCode(CodeEnum.STOCK_TRANSFER.getCode());
-        stockJournal.setType(3);
+        stockJournal.setOpType(2);//出库
+        stockJournal.setType(JournalType.ADJUSTING_OUT.getDetailType());//调仓入库
         stockJournal.setWarehouseId(stockDto.getWarehouseId());
         stockJournal.setToWarehouseId(stockDto.getToWarehouseId());
         //保存出入库记录
         stockJournalService.save(stockJournal);
         //操作库存
         List<StockJournalDetails> stockJournalDetailsList = ModifyInventory(stockJournal.getId(), 2, stockDto.getList(), stockDto.getWarehouseId());
-        ModifyInventory(stockJournal.getId(), 1, stockDto.getList(), stockDto.getToWarehouseId());
         //保存出入库明细
         stockJournalDetailsService.saveBatch(stockJournalDetailsList);
+
+        //创建入库记录
+        StockJournal stockJournal1 = new StockJournal();
+        stockJournal1.setCode(CodeEnum.STOCK_TRANSFER.getCode());
+        stockJournal1.setOpType(1);//入库
+        stockJournal1.setType(JournalType.ADJUSTING_IN.getDetailType());//调仓出库
+        stockJournal1.setWarehouseId(stockDto.getWarehouseId());
+        stockJournal1.setToWarehouseId(stockDto.getToWarehouseId());
+        //保存出入库记录
+        stockJournalService.save(stockJournal1);
+
+        //入库操作
+        List<StockJournalDetails> stockJournalDetailsList1 = ModifyInventory(stockJournal1.getId(), 1, stockDto.getList(), stockDto.getToWarehouseId());
+        //保存出入库明细
+        stockJournalDetailsService.saveBatch(stockJournalDetailsList1);
     }
 
     @Override
@@ -407,14 +424,22 @@ public class StockServiceImpl extends ServiceImpl<StockMapper, Stock> implements
         stockJournal.setType(journalType.getDetailType());
         switch (journalType.getDetailType()){
             case 1:
+                stockJournal.setOpType(1);//入库
                 stockJournal.setCode(CodeEnum.SIN_CODE.getCode());
                 break;
             case 2:
+                stockJournal.setOpType(2);//出库
                 stockJournal.setCode(CodeEnum.SOUT_CODE.getCode());
                 break;
             case 3:
-                stockJournal.setCode(CodeEnum.STOCK_TRANSFER.getCode());
+                stockJournal.setOpType(1);//入库
+                stockJournal.setCode(CodeEnum.STOCK_TRANSFER.getCode());//调仓入库
+                break;
+            case 11:
+                stockJournal.setOpType(2);//出库
+                stockJournal.setCode(CodeEnum.STOCK_TRANSFER.getCode());//调仓出库
                 break;
+
         }
         stockJournal.setBusinessId(businessId);
         stockJournal.setWarehouseId(warehouseId);

hx-wms/src/main/java/com/fjhx/wms/service/stock/impl/StockWaitServiceImpl.java

@@ -11,6 +11,8 @@ import com.fjhx.item.entity.product.po.ProductInfo;
 import com.fjhx.item.service.product.ProductInfoService;
 import com.fjhx.wms.entity.stock.dto.StockWaitDto;
 import com.fjhx.wms.entity.stock.dto.StockWaitSelectDto;
+import com.fjhx.wms.entity.stock.emums.JournalType;
+import com.fjhx.wms.entity.stock.emums.StockWaitType;
 import com.fjhx.wms.entity.stock.po.*;
 import com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo;
 import com.fjhx.wms.entity.stock.vo.StockWaitVo;
@@ -88,7 +90,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         //过滤入库/出库
         wrapper.eq(StockWait::getType, dto.getType());
         wrapper.eq(StockWait::getBusinessCode, dto.getKeyword());
-        wrapper.eq(StockWait::getStatus,dto.getStatus());
+        wrapper.eq(StockWait::getStatus, dto.getStatus());
         Page<StockWaitVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
 
         List<StockWaitVo> records = page.getRecords();
@@ -152,7 +154,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
             Map<Long, ProductInfo> productInfoMap = productInfos.stream().collect(Collectors.toMap(ProductInfo::getId, Function.identity()));
             for (StockWaitDetailsVo stockWaitDetails : stockWaitDetailsVos) {
                 ProductInfo productInfo = productInfoMap.get(stockWaitDetails.getProductId());
-                if(ObjectUtil.isEmpty(productInfo)){
+                if (ObjectUtil.isEmpty(productInfo)) {
                     continue;
                 }
                 stockWaitDetails.setProductName(productInfo.getName());
@@ -178,8 +180,25 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         StockWait byId = getById(stockWaitDetails.getStockWaitId());
         //创建出入库记录
         StockJournal stockJournal = new StockJournal();
-        stockJournal.setType(byId.getType() == 1 ? 4 : 5);
-        stockJournal.setCode(byId.getType()==1? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
+        stockJournal.setOpType(byId.getType());
+        //根据待入库业务类型创建待出入库记录
+        Integer businessType = stockWaitDto.getBusinessType();
+        if (StockWaitType.BORDER_OF_LINE_IN.getDetailType().equals(businessType)) {
+            //线边回仓库
+            stockJournal.setType(JournalType.BORDER_OF_LINE_IN.getDetailType());
+        } else if (StockWaitType.COMPLETION_IN.getDetailType().equals(businessType)) {
+            //完工入库
+            stockJournal.setType(JournalType.COMPLETION_IN.getDetailType());
+        } else if (StockWaitType.PURCHASE_ARRIVAL_IN.getDetailType().equals(businessType)) {
+            //采购到货
+            stockJournal.setType(JournalType.PURCHASE_ARRIVAL_IN.getDetailType());
+        } else if (StockWaitType.BACK_OUT.getDetailType().equals(businessType)) {
+            //退货出货
+            stockJournal.setType(JournalType.BACK_OUT.getDetailType());
+        } else {
+            throw new ServiceException("未知待入库业务类型");
+        }
+        stockJournal.setCode(byId.getType() == 1 ? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
         stockJournal.setWarehouseId(stockWaitDto.getWarehouseId());
         stockJournal.setBusinessId(byId.getId());
         //保存出入库记录
@@ -228,9 +247,9 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         stockWaitDetailsService.updateBatchById(stockWaitDetails);
         //修改待入库状态
         StockWait stockWait = getById(stockWaitDto.getId());
-        if(statusFlag==stockWaitDetails.size()){
+        if (statusFlag == stockWaitDetails.size()) {
             stockWait.setStatus(2);//入库完成
-        }else{
+        } else {
             stockWait.setStatus(1);//部分入库
         }
         updateById(stockWait);
@@ -238,7 +257,7 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         //创建出入库记录
         StockJournal stockJournal = new StockJournal();
         stockJournal.setType(stockWaitDto.getType() == 1 ? 4 : 5);
-        stockJournal.setCode(stockWait.getType()==1?CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
+        stockJournal.setCode(stockWait.getType() == 1 ? CodeEnum.SIN_CODE.getCode() : CodeEnum.SOUT_CODE.getCode());
         stockJournal.setWarehouseId(stockWaitDto.getWarehouseId());
         stockJournal.setBusinessId(stockWaitDto.getId());
         //保存出入库记录

hx-wms/src/main/resources/mapper/stock/StockJournalDetailsMapper.xml

@@ -3,11 +3,14 @@
 <mapper namespace="com.fjhx.wms.mapper.stock.StockJournalDetailsMapper">
     <select id="getPage" resultType="com.fjhx.wms.entity.stock.vo.StockJournalDetailsVo">
         SELECT
+            sjd.id,
+            sj.op_type,
             sj.type,
             w.`name` warehouseName,
             sjd.product_id,
             sjd.quantity,
-            sjd.create_time
+            sjd.create_time,
+            sjd.create_user
         FROM
             stock_journal sj
                 JOIN stock_journal_details sjd ON sjd.stock_journal_id = sj.id