手动出入库列表调整

hx-jushuitan/src/main/java/com/fjhx/jushuitan/initializers/JstInitializer.java

@@ -1,5 +1,6 @@
 package com.fjhx.jushuitan.initializers;
 
+import cn.hutool.extra.spring.SpringUtil;
 import com.fjhx.jushuitan.service.api.JstApiService;
 import org.springframework.stereotype.Component;
 
@@ -13,6 +14,9 @@ public class JstInitializer {
 
     @PostConstruct
     public void dataInitializer() {
+        if ("dev".equals(SpringUtil.getActiveProfile())) {
+            return;
+        }
         jstApiService.startOrder();
     }
 

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

@@ -5,6 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 出入库记录明细列表查询返回值实体
@@ -106,4 +107,18 @@ public class StockJournalDetailsVo extends StockJournalDetails {
      * 金额
      */
     private BigDecimal amount;
+
+
+    /**
+     * 生产订单号
+     */
+    private String prodOrderCode;
+    /**
+     * 预计归还时间
+     */
+    private Date expectRestitutionTime;
+    /**
+     * 归还时间
+     */
+    private Date restitutionTime;
 }

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

@@ -57,6 +57,26 @@ public class StockJournalDetailsServiceImpl extends ServiceImpl<StockJournalDeta
             wrapper.eq("sjd.company_id", dto.getCompanyId());
         }
 
+        //是否归还过滤
+        Integer isRestitution = dto.getIsRestitution();
+        if (ObjectUtil.isNotEmpty(isRestitution)) {
+            if (ObjectUtil.equals(isRestitution, 0)) {
+                wrapper.isNull("sj.restitution_id");
+            } else {
+                wrapper.isNotNull("sj.restitution_id");
+            }
+        }
+
+        //是否寻回过滤
+        Integer isSeek = dto.getIsSeek();
+        if (ObjectUtil.isNotEmpty(isSeek)) {
+            if (ObjectUtil.equals(isSeek, 0)) {
+                wrapper.isNull("sj.seek_id");
+            } else {
+                wrapper.isNotNull("sj.seek_id");
+            }
+        }
+
         Page<StockJournalDetailsVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         List<StockJournalDetailsVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {

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

@@ -7,16 +7,20 @@
                sj.type,
                sj.`code`,
                sj.warehouse_id,
-               w.`name` warehouseName,
+               w.`name`     warehouseName,
                sjd.product_id,
                sjd.quantity,
                sjd.create_time,
                sjd.create_user,
                sj.business_id,
-               sjd.stock_journal_id
+               sjd.stock_journal_id,
+               po.`code` as prodOrderCode,
+               sj.expect_restitution_time,
+               sj.restitution_time
         FROM stock_journal_details sjd
                  LEFT JOIN stock_journal sj ON sjd.stock_journal_id = sj.id
                  LEFT JOIN warehouse w ON sj.warehouse_id = w.id
+                 LEFT JOIN production_order po ON sj.prod_order_id = po.id
             ${ew.customSqlSegment}
     </select>