待出入库 问题处理

hx-purchase/src/main/java/com/fjhx/purchase/service/subscribe/impl/SubscribeDetailServiceImpl.java

@@ -124,8 +124,8 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
 
         //如果是待采购页面
         if (ObjectUtil.equals(dto.getIsWaitPurchase(), 1)) {
-            //过滤要入库的数据
-            wrapper.eq("t2", Subscribe::getIsInStock, 1);
+            //过滤要入库的数据 or 来自合同的数据
+            wrapper.eq("t2", Subscribe::getIsInStock, 1).or().ne("t2", SubscribeDetail::getDataType, 0);
         }
 
         Page<SubscribeDetailVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
@@ -267,7 +267,11 @@ public class SubscribeDetailServiceImpl extends ServiceImpl<SubscribeDetailMappe
         }
 
         SubscribeService subscribeService = SpringUtil.getBean(SubscribeService.class);
-        SubscribeVo detail = subscribeService.detail(list.get(0).getSubscribeId());
+        Long subscribeId = list.get(0).getSubscribeId();
+        SubscribeVo detail = new SubscribeVo();
+        if (ObjectUtil.isNotEmpty(subscribeId)) {
+            detail = subscribeService.detail(subscribeId);
+        }
         detail.setSubscribeDetailList(list);
 
         return detail;

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

@@ -58,4 +58,9 @@ public class StockWait extends BasePo {
      */
     private Long companyId;
 
+    /**
+     * 生产订单id
+     */
+    private Long prodOrderId;
+
 }

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

@@ -89,9 +89,9 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
         }
 
         //过滤入库/出库
-        wrapper.eq(StockWait::getType, dto.getType());
+        wrapper.eq("sw", StockWait::getType, dto.getType());
         wrapper.eq("sw", StockWait::getBusinessType, dto.getBusinessType());
-        wrapper.eq(StockWait::getBusinessCode, dto.getKeyword());
+        wrapper.eq("sw", StockWait::getBusinessCode, dto.getKeyword());
 
         //先报损超领、丢件超领，然后创建时间升序
         wrapper.orderByDesc("field(sw.business_type,4,5)");