Merge remote-tracking branch 'origin/deli_scp' into deli_scp

# Conflicts: # src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
1 changed files with 1 additions and 1 deletions
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts
@ -124,7 +124,7 @@ export const PurchasePlanMain = useCrudSchemas(reactive<CrudSchema[]>([
        searchPage: PurchaseMainApi.getPurchaseMainPage,
        searchCondition: [{
          key: 'type',
-          value: 'DISCRETE',
+          value: 'SCHEDULE,OUTSOURCING,DISCRETE',
          isMainValue: false
        },{
          key: 'available',
Author	SHA1	Message	Date
kakilu	9962e4b6bc	Merge remote-tracking branch 'origin/deli_scp' into deli_scp # Conflicts: # src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts	2 weeks ago
kakilu	3328dee31d	Merge remote-tracking branch 'origin/deli_scp' into deli_scp	1 month ago
王宇飞	adc4628c74	要货预测-更新用到的接口	2 months ago