|
|
@@ -33,6 +33,7 @@ import com.fjhx.wms.service.warehouse.WarehouseService;
|
|
|
import com.fjhx.wms.utils.CodeEnum;
|
|
|
import com.obs.services.internal.ServiceException;
|
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
+import com.ruoyi.common.utils.wrapper.SqlField;
|
|
|
import com.ruoyi.system.utils.UserUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@@ -108,10 +109,15 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
|
|
|
wrapper.orderByDesc("sw", StockWait::getId);
|
|
|
//过滤入库/出库
|
|
|
wrapper.eq(StockWait::getType, dto.getType());
|
|
|
- wrapper.eq(StockWait::getBusinessCode, dto.getKeyword());
|
|
|
wrapper.eq(StockWait::getStatus, dto.getStatus());
|
|
|
wrapper.eq("sw", StockWait::getBusinessType, dto.getBusinessType());
|
|
|
|
|
|
+ //关键字搜索
|
|
|
+ wrapper.keyword(dto.getKeyword(),
|
|
|
+ new SqlField(StockWait::getBusinessCode),
|
|
|
+ new SqlField("json_unquote(sw.victoriatourist_json -> '$.code')")
|
|
|
+ );
|
|
|
+
|
|
|
//过滤掉待出入库 已完成/手动结束 的数据
|
|
|
wrapper.notIn("sw", StockWait::getStatus, 2, 3);
|
|
|
|
yzc