Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/api/wms/inventorymoveRecordMain/index.ts

@@ -81,6 +81,18 @@ export const exportOkToHoldRecordMain = async (params) => {
    return await request.download({ url: `/wms/inventorymove-record-main/export-excel`, params })
   }
 }
+
+// 导出物料隔离记录主 Excel
+export const exportOkToHoldRecordOkToHoldMain = async (params) => {
+  params.businessType = 'OkToHold'
+  if (params.isSearch) {
+    delete params.isSearch
+    const data = {...params}
+    return await request.downloadPost({ url: '/wms/inventorymove-record-main/export-excel-senior-OkToHold', data })
+  } else {
+   return await request.download({ url: `/wms/inventorymove-record-main/export-excel-OkToHold`, params })
+  }
+}
 // 导出合格转隔离记录主 Excel
 export const exportNokToHoldRecordMain = async (params) => {
   params.businessType = 'NokToHold'

src/api/wms/supplierdeliverRecordMain/index.ts

@@ -86,6 +86,11 @@ export const getItemStatus = async (id) => {
   return await request.post({ url: `/wms/supplierdeliver-record-main/getItemStatus?id=` + id })
 }
 
+// 打印发货单前查询物料的状态，从而确定使用哪个积木模版
+export const getPoLineType = async (id) => {
+  return await request.post({ url: `/wms/supplierdeliver-record-main/getPoLineType?id=` + id })
+}
+
 // 创建采购申请
 export const createPurchasereceiptRequest = async (number:string) => {
   return await request.post({ url: `/wms/supplierdeliver-record-main/createPurchasereceiptRequest?number=`+number })

src/utils/dict.ts

@@ -420,6 +420,8 @@ export enum DICT_TYPE {
   SUPPLIER_TOOL_APPORT_STATEMENT_DETAIL = 'supplier_tool_apport_statement_detail', // 供应商模具费用子
   PRODUCTION_LINE_ITEM = 'production_line_item', //顺引生产线项
   CLASS_ITEM = 'class_item', //顺引班组项
+  DUTY = 'duty', //责任
+  DUTY_DETAILS ="duty_details",//责任明细字典
   
   
 }

src/views/wms/basicDataManage/labelManage/callmaterials/callmaterials.data.ts

@@ -77,6 +77,23 @@ export const Callmaterials = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
+  {
+    label: '背番',
+    field: 'itemDesc1',
+    sort: 'custom',
+    isSearch: true,
+isForm:false,
+hiddenSearchHigh:true,
+sortTableDefault:1,
+    table: {
+      width: 150
+    },
+form:{
+      componentProps:{
+        disabled: true,
+      }
+    }
+  },
   {
     label: '包装规格',
     field: 'packUnit',

src/views/wms/basicDataManage/supplierManage/purchaseprice/purchaseprice.data.ts

@@ -91,6 +91,7 @@ export const Purchaseprice = useCrudSchemas(reactive<CrudSchema[]>([
     label: '背番',
     field: 'backNumber',
     sort: 'custom',
+    isForm:false,
     hiddenSearchHigh:true,
     isSearch: true,
     table: {

src/views/wms/inventoryManage/expectin/expectin.data.ts

@@ -30,6 +30,15 @@ export const Expectin = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
   {
     label: '批次',
     field: 'batch',

src/views/wms/inventoryManage/expectout/expectout.data.ts

@@ -30,6 +30,15 @@ export const Expectout = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isSearch: true,
   },
+  {
+    label: '背番',
+    field: 'backNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isSearch: true,
+  },
   {
     label: '包装号',
     field: 'packingNumber',

src/views/wms/inventoryManage/package/index.vue

@@ -205,8 +205,13 @@ const handleSelectionPoint = async ()=>{
     }
     if (res.cgLabel) {
       //采购标签
-      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      PackageApi.getPrintingLableId({packingNumbers:(rows)}).then(res => {
-      window.open(src.value+'&asn_number='+res.cgLabel)
+        console.log(res)
+        window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
+      }).catch(err => {
+        console.log(err)
+        message.error('创建标签失败')
+      })
     }
     if(!res.cgLabel&&!res.zzLabel){
       message.warning('包装不存在，无法打印或者是线边物料数据不生成包装!')

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

@@ -93,6 +93,7 @@ import * as InventoryinitRequestDetailApi from '@/api/wms/inventoryinitRequestDe
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { formatTime } from '@/utils/index'
 const { loadStart, loadDone } = usePageLoading()
 // 库存初始化申请
 defineOptions({ name: 'InventoryinitRequestMain' })
@@ -130,6 +131,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           newRow['packUnit'] = item['defaultPackUnit']
           newRow['packQty'] = item['defaultPackQty']
           newRow['uom'] = item['uom']
+          newRow['batch'] = formatTime(new Date(), 'yyyyMMdd')
           tableData.value.push(newRow)
         })
         

src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/inventoryinitRequestMain.data.ts

@@ -490,6 +490,19 @@ export const InventoryinitRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    tableForm: {
+      disabled: false,
+      type:'FormDate',
+      placeholder: '请选择到批次',
+      valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
+    },
+    form: {
+      componentProps: {
+        disabled: false,
+        valueFormat: 'YYYYMMDD',
+      }
+    }
   },
   // {
   //   label: '包装号',

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts

@@ -894,9 +894,19 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[
     table: {
       width: 150
     },
-    // tableForm: {
+    tableForm: {
-    //   disabled: true
+      disabled: false,
-    // }
+      type:'FormDate',
+      placeholder: '请选择到批次',
+      valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
+    },
+    form: {
+      componentProps: {
+        disabled: false,
+        valueFormat: 'YYYYMMDD',
+      }
+    }
   },
   // {
   //   label: '包装号',

src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/index.vue

@@ -252,7 +252,7 @@ const handleExport = async () => {
     // 发起导出
     loadStart()
     const excelTitle = ref(route.meta.title)
-    const data = await InventorymoveRecordMainApi.exportOkToHoldRecordMain(tableObject.params)
+    const data = await InventorymoveRecordMainApi.exportOkToHoldRecordOkToHoldMain(tableObject.params)
     download.excel(data, `【${excelTitle.value}】【${formatDate(new Date())}】.xlsx`)
   } catch {
   } finally {

src/views/wms/moveManage/inventorymove/inventorymoveRecordMainOKHOLD/inventorymoveRecordMainOKHOLD.data.ts

@@ -228,6 +228,35 @@ export const InventorymoveRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     sortTableDefault:9,
   },
+  {
+    label: '责任',
+    field: 'duty',
+    dictType: DICT_TYPE.DUTY,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
+  },
+  {
+    label: '部门',
+    field: 'dutyDept',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
+  },
+  {
+    label: '责任明细',
+    field: 'dutyDetails',
+    dictType: DICT_TYPE.DUTY_DETAILS,
+    dictClass: 'string',
+    table: {
+      width: 150
+    },
+    sortTableDefault:9,
+  },
 
   // {
   //   label: '部门',

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

@@ -599,7 +599,7 @@ const planSwitch = ref(false)
 const requestSwitch = ref(false)
 const getSwitch = async ()=>{
   let switch1  = await SwitchApi.getByCode('CreatePrepareToIssuePlanAfterProductionPlanPublished')
-  planSwitch.value = switch1=='TRUE'
+  planSwitch.value = false
   let switch2  = await SwitchApi.getByCode('CreateProductReciptRequestAfterProductionPlanPublished')
   requestSwitch.value = switch2=='TRUE'
   console.log('switch1',switch1)

src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue

@@ -904,7 +904,7 @@ const getPurchanseList = async ()=>{
     sort: '',
     by: 'ASC'
   })
-  if(res&&res.list&&res.list.length==1){
+  if(res&&res.list&&res.list.length>1){
     const setV = {}
     setV['hahaha'] = ''
     setV['hehehe'] = res.list[0]['number']

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRecordMain/index.vue

@@ -262,6 +262,22 @@ const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' +
 const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken())
 
 const handleDocumentPrint = async (id) => {
+  await SupplierdeliverRecordMainApi.getPoLineType(id).then(async (res) => {
+    if (res.isM && res.haveNOM == false) {
+      //号试（生准订单）模板
+      window.open(documentSrc2.value + '&id=' + id + '&type=' + 'M')
+    }
+    if (res.isM && res.haveNOM && res.noMAndItemStatus == '生准订单') {
+      //号试（生准订单）模板
+      window.open(documentSrc2.value + '&id=' + id )
+    }
+    if (res.isM && res.haveNOM && res.noMAndItemStatus != '生准订单') {
+      //（生准订单）模板 M型物料
+      window.open(documentSrc.value + '&id=' + id+ '&type=' + 'M')
+       //（补给品订单）模板
+       window.open(documentSrc.value + '&id=' + id)
+    }
+    if (res.isM == false) {
       await SupplierdeliverRecordMainApi.getItemStatus(id).then(async (res) => {
         if (res) {
           //号试（生准订单）模板
@@ -271,6 +287,8 @@ const handleDocumentPrint = async (id) => {
         }
       })
     }
+  })
+}
 
 // 子包装数据
 const detailParenPackingRef = ref()

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts

@@ -1368,6 +1368,18 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTable: false,
     isForm: false
   },
+  {
+    label: '行类型',
+    field: 'poLineType',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    hiddenInMain:true,
+    isTableForm: true,
+    isTable: true,
+    isForm: true
+  },
   {
     label: '是否上架',
     field: 'isPutaway',