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

src/api/wms/qadproductionplan/index.ts

@@ -26,6 +26,17 @@ export const getQadProductionPlanMainPage = async (params) => {
     return await request.get({ url: `/wms/qad-production-plan-main/page`, params })
   }
 }
+export const getQadProductionPlanDetailPage = async (params) => {
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.post({ url: '/wms/qad-production-plan-detail/senior', data })
+  } else {
+    return await request.get({ url: `/wms/qad-production-plan-detail/page`, params })
+  }
+}
+
+
 
 // 查询QAD生产计划主详情
 export const getQadProductionPlanMain = async (id: number) => {

src/views/wms/basicDataManage/itemManage/itempackage/index.vue

@@ -52,6 +52,7 @@
     :apiCreate="ItempackagingApi.createItempackaging"
     @searchTableSuccess="searchTableSuccess"
     :isBusiness="false"
+    @onEnter="onEnter"
   />
 
   <!-- 详情 -->
@@ -75,6 +76,10 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import TableHead from '@/components/TableHead/src/TableHead.vue'
 import ImportForm from '@/components/ImportForm/src/ImportForm.vue'
 import Detail from '@/components/Detail/src/Detail.vue'
+import * as ItembasicApi from '@/api/wms/itembasic'
+import { Itembasic } from '../itembasic/itembasic.data'
+import * as PackageunitApi from '@/api/wms/packageunit'
+import { Packageunit } from '../packageunit/packageunit.data'
 
 defineOptions({ name: 'Itempackaging' })
 
@@ -205,6 +210,41 @@ const formsSuccess = async (formType, data) => {
   basicFormRef.value.dialogVisible = false
   getList()
 }
+const onEnter = async (field,value)=>{
+  console.log('onEnter',field,value)
+  if('itemCode'==field){
+    //物料代码
+    basicFormRef.value.opensearchTable('itemCode', 'code', '物料基础信息', Itembasic.allSchemas, ItembasicApi.getItembasicPage,[{
+      key: 'available',
+      value: 'TRUE',
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    },{
+      key: 'code',
+      value: value,
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    }])
+
+  }else if('packUnit'==field){
+    //包装规格
+    basicFormRef.value.opensearchTable('packUnit', 'code', '包装规格信息', Packageunit.allSchemas, PackageunitApi.getPackageunitPage,[{
+      key: 'available',
+      value: 'TRUE',
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    },{
+      key: 'code',
+      value: value,
+      action: '==',
+      isSearch: true,
+      isMainValue: false
+    }])
+  }
+}
 // 查询页面返回
 const searchTableSuccess = (formField, searchField, val, formRef) => {
   nextTick(() => {

src/views/wms/basicDataManage/itemManage/itempackage/itempackage.data.ts

@@ -23,6 +23,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true, //可输入回车
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择物料代码', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段
@@ -64,6 +65,7 @@ export const Itempackaging = useCrudSchemas(reactive<CrudSchema[]>([
     form: {
       // labelMessage: '信息提示说明！！！',
       componentProps: {
+        enterSearch: true, //可输入回车
         isSearchList: true, // 开启查询弹窗
         searchListPlaceholder: '请选择包装规格', // 输入框占位文本
         searchField: 'code', // 查询弹窗赋值字段

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue

@@ -109,7 +109,16 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
     if (type == 'tableForm') {
       // 明细查询页赋值
       row[formField] = val[0][searchField]
+      if(formField=='itemCode'){
+        //物料代码
         row['uom'] = val[0]['uom']
+      }else if(formField=='packUnit'){
+        //包装规格1
+        row['packQty'] = val[0]['packQty']
+      }else if(formField=='secondPackUnit'){
+        //包装规格2
+        row['secondPackQty'] = val[0]['packQty']
+      }
     } else {
       const setV = {}
       setV[formField] = val[0][searchField]

src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/preparetoissueMain.data.ts

@@ -2,13 +2,17 @@ import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
 import {dateFormatter, dateFormatter2} from '@/utils/formatTime'
 
 import * as ProductionMainApi from '@/api/wms/productionMain'
-import { ProductionMain } from '@/views/wms/productionManage/productionplan/productionMain/productionMain.data'
+import {
+  ProductionMain
+} from '@/views/wms/productionManage/productionplan/productionMain/productionMain.data'
 
 import * as WorkshopApi from '@/api/wms/workshop'
 import {Workshop} from '@/views/wms/basicDataManage/factoryModeling/workshop/workshop.data'
 
 import * as ProductionlineApi from '@/api/wms/productionline'
-import { Productionline } from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
+import {
+  Productionline
+} from '@/views/wms/basicDataManage/factoryModeling/productionline/productionline.data'
 
 import * as ShiftApi from '@/api/wms/shift'
 import {Shift} from '@/views/wms/basicDataManage/orderManage/shift/shift.data'
@@ -18,7 +22,6 @@ import { Team } from '@/views/wms/basicDataManage/orderManage/team/team.data'
 
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 // import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
-
 // import * as BomApi from '@/api/wms/bom'
 import {Bom} from '@/views/wms/basicDataManage/itemManage/bom/bom.data'
 
@@ -231,10 +234,16 @@ export const PreparetoissueMain = useCrudSchemas(reactive<CrudSchema[]>([
           key: 'status',
           value: '6',
           isMainValue: false
-        },{
+        },
+        {
           key: 'available',
           value: 'TRUE',
           isMainValue: false
+        },
+        {
+          key: 'planType',
+          value: 'predict',
+          isMainValue: false
         }]
       }
     }

src/views/wms/productionManage/productionplan/qadproductionplan/index.vue

@@ -91,7 +91,7 @@ const updataTableColumns = (val) => {
 }
 
 const { tableObject, tableMethods } = useTable({
-  getListApi: QadProductionPlanMainApi.getQadProductionPlanMainPage // 分页接口
+  getListApi: QadProductionPlanMainApi.getQadProductionPlanDetailPage // 分页接口
 })
 
 // 获得表格的各种操作

src/views/wms/productionManage/productionplan/qadproductionplan/qadProductionPlanMain.data.ts

@@ -1,5 +1,5 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter2 } from '@/utils/formatTime'
 
 // 表单校验
 export const QadProductionPlanMainRules = reactive({
@@ -9,35 +9,31 @@ export const QadProductionPlanMainRules = reactive({
 })
 
 export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '顺序',
-    field: 'displayOrder',
-    sort: 'custom',
-    form: {
-      component: 'InputNumber',
-      value: 0
-    },
-  },
   {
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    table: {
+      width: 350,
+    }
   },
   {
-    label: '车间',
+    label: '物料代码',
-    field: 'workshop',
+    field: 'itemCode',
     sort: 'custom',
     isSearch: true,
+    table: {
+      width: 150,
+    }
   },
   {
-    label: '生产线',
+    label: '计划数量',
-    field: 'productionLine',
+    field: 'planQty',
     sort: 'custom',
-    isSearch: true,
   },
   {
-    label: '班次',
+    label: '生产线',
-    field: 'shift',
+    field: 'productionLine',
     sort: 'custom',
     isSearch: true,
   },
@@ -50,7 +46,7 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '计划日期',
     field: 'planDate',
     sort: 'custom',
-    formatter: dateFormatter,
+    formatter: dateFormatter2,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -59,11 +55,6 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       }
     },
   },
-  {
-    label: '明细列表',
-    field: 'details',
-    sort: 'custom',
-  },
   {
     label: '计划类型',
     field: 'planType',
@@ -80,33 +71,33 @@ export const QadProductionPlanMain = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'SelectV2'
     },
   },
-  {
+  // {
-    label: '备注',
+  //   label: '备注',
-    field: 'remark',
+  //   field: 'remark',
-    sort: 'custom',
+  //   sort: 'custom',
-  },
+  // },
-  {
+  // {
-    label: '是否可用',
+  //   label: '是否可用',
-    field: 'available',
+  //   field: 'available',
-    sort: 'custom',
+  //   sort: 'custom',
-    isForm: false,
+  //   isForm: false,
-  },
+  // },
-  {
+  // {
-    label: '状态',
+  //   label: '状态',
-    field: 'status',
+  //   field: 'status',
-    sort: 'custom',
+  //   sort: 'custom',
-    isForm: false,
+  //   isForm: false,
-  },
+  // },
-  {
+  // {
-    label: '订单号',
+  //   label: '订单号',
-    field: 'woNumber',
+  //   field: 'woNumber',
-    sort: 'custom',
+  //   sort: 'custom',
-  },
+  // },
-  {
+  // {
-    label: '订单行',
+  //   label: '订单行',
-    field: 'woLine',
+  //   field: 'woLine',
-    sort: 'custom',
+  //   sort: 'custom',
-  },
+  // },
   // {
   //   label: '操作',
   //   field: 'action',

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts

@@ -15,15 +15,6 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true
   },
-  {
-    label: '申请单号',
-    field: 'requestNumber',
-    sort: 'custom',
-    table: {
-      width: 180,
-    },
-    isSearch: true
-  },
   {
     label: '供应商代码',
     field: 'supplierCode',
@@ -31,6 +22,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 150
     },
+    sortTableDefault:1,
     isSearch: true
   },
   {
@@ -40,8 +32,38 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180,
     },
+    sortTableDefault:2,
     isForm: false
   },
+  {
+    label: '状态',
+    field: 'status',
+    dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sortTableDefault:10,
+    isForm:false,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+    form: {
+      value: '1',
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '申请单号',
+    field: 'requestNumber',
+    sort: 'custom',
+    table: {
+      width: 180,
+    },
+    isSearch: true
+  },
   {
     label: '订单号',
     field: 'poNumber',
@@ -541,6 +563,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 150
     },
+    sortTableDefault:7,
   },
   {
     label: '订单行',
@@ -550,6 +573,22 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
+  {
+    label: '物流收货单号',
+    field: 'recvBillNum',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
   {
     label: '单据号',
     field: 'number',
@@ -566,6 +605,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     table: {
       width: 180
     },
+    sortTableDefault:8,
   },
   {
     label: '供应商代码',
@@ -579,10 +619,48 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
+    sortTableDefault:3,
     table: {
       width: 150
     },
   },
+  {
+    label: '物料描述',
+    field: 'itemDesc',
+    table: {
+      width: 150
+    },
+    sortTableDefault:4,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '到货时间',
+    field: 'planArriveTime',
+    table: {
+      width: 150
+    },
+    formatter: dateFormatter2,
+    sortTableDefault:5,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
+  {
+    label: '到货数量',
+    field: 'arrivalQty',
+    table: {
+      width: 150
+    },
+    sortTableDefault:6,
+    isForm:false,
+    isTableForm:false,
+    isDetail: false,
+    isTable: true,
+  },
   {
     label: '物料名称',
     field: 'itemName',

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue

@@ -409,6 +409,11 @@ const handleImport = () => {
   /** 添加/修改操作 */
   const formRef = ref()
   const openForm = async (type : string, row ?: number) => {
+    if(type=='update'){
+      SupplierinvoiceRequestMainRules.invoiceTime[0].required = true
+    }else{
+      SupplierinvoiceRequestMainRules.invoiceTime[0].required = false
+    }
     if(row&&row.procurementCreator) row.procurementCreator = Number(row.procurementCreator)
     // 校验是否可以开票
     SupplierinvoiceRequestMainApi.checkInvoicingCalendar({}).then(res => {

src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts

@@ -765,6 +765,9 @@ export const SupplierinvoiceRequestMainRules = reactive({
   supplierCode: [
     { required: true, message: '请选择供应商代码', trigger: 'change' }
   ],
+  invoiceTime:[
+    { required: false, message: '请选择发票日期', trigger: 'blur' }
+  ],
   departmentCode: [
     { required: true, message: '请输入部门', trigger: 'blur' }
   ],