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

src/api/wms/purchaseClaimRecordMain/index.ts

@@ -60,7 +60,12 @@ export const rejectPurchaseClaimRecordMain = async (id: number) => {
 
 // 导出采购索赔主 Excel
 export const exportPurchaseClaimRecordMain = async (params) => {
+  if (params.isSearch) {
+    const data = {...params}
+    return await request.downloadPost({ url: `/wms/purchaseClaim-record-main/export-excel-senior`, data })
+  }else{
     return await request.download({ url: `/wms/purchaseClaim-record-main/export-excel`, params })
+  }
 }
 
 // 下载用户导入模板

src/api/wms/scrapRequestDetail/index.ts

@@ -17,12 +17,15 @@ export interface ScrapRequestDetailVO {
   itemDesc1: string
   itemDesc2: string
   projectCode: string
+  inventoryQty: number
   qty: number
   uom: string
   updateTime: Date
   updater: string
 }
 
+const message = useMessage() // 消息弹窗
+
 // 查询报废出库申请子列表
 export const getScrapRequestDetailPage = async (params) => {
   if (params.isSearch) {
@@ -46,6 +49,10 @@ export const createScrapRequestDetail = async (data: ScrapRequestDetailVO) => {
 
 // 修改报废出库申请子
 export const updateScrapRequestDetail = async (data: ScrapRequestDetailVO) => {
+  if(parseFloat(data.inventoryQty) < parseFloat(data.qty)){
+    message.warning("数量不能大于库存数量")
+    return
+  }
   return await request.put({ url: `/wms/scrap-request-detail/update`, data })
 }
 

src/locales/zh-CN.ts

@@ -1317,6 +1317,7 @@ export default {
     是否确认分摊金额: '是否确认分摊金额？',
     创建开票申请: '创建开票申请',
     作废成功:'作废成功',
+    退回: '退回',
   },
 
 }

src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts

@@ -529,7 +529,8 @@ export const DeliverRecordMainRules = reactive({
     { required: true, message: '请选择发运时间', trigger: 'blur' }
   ],
   billNo: [
-    { required: true, message: '请输入顺引单据号', trigger: 'blur' }
+    { required: true, message: '请输入顺引单据号', trigger: 'blur' },
+    { max: 18, message: '字符不得超过18位', trigger: 'blur' },
   ]
 })
 
@@ -1018,7 +1019,8 @@ export const DeliverRecordDetailRules = reactive({
     { required: true, message: '请输入数量', trigger: 'blur' }
   ],
   serialNo: [
-    { required: true, message: '请输入顺序号', trigger: 'blur' }
+    { required: true, message: '请输入顺序号', trigger: 'blur' },
+    { max: 64, message: '字符不得超过64位', trigger: 'blur' },
   ],
   classes: [
     { required: true, message: '请选择班次', trigger: 'blur' }

src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue

@@ -394,6 +394,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
 } 
 
 const searchTableAddSuccess = (formField, searchField, val, formRef, type, row) => {
+  console.log(type)
   if (type == 'tableForm') {
       if(formField == 'itemCode') {
         const tableFormKeys = {}
@@ -413,9 +414,13 @@ const searchTableAddSuccess = (formField, searchField, val, formRef, type, row)
           newRow['id'] = item['id']
           tableData.value.push(newRow)
         })
-      }else{
+      } else {
         row[formField] = val[0][searchField]
       }
+    }else  if(formField == 'customerCode'){
+    const setV = {}
+    setV[formField] = val[0][searchField]
+    formRef.setValues(setV)
   }
 } 
 

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

@@ -839,12 +839,12 @@ export const BalancePackageRules = reactive({
     { required: true, message: '请输入打印数量', trigger: ['change', 'blur'] },
     { validator: validatePositiveNumber, message: '必须是一个正数', trigger: ['change','blur'] }
   ],
-  supplierItemCode: [
+  // supplierItemCode: [
-    { required: true, message: '请输入标签供应商代码', trigger: 'blur' }
+  //   { required: true, message: '请输入标签供应商代码', trigger: 'blur' }
-  ],
+  // ],
-  productionLineCodePackage: [
+  // productionLineCodePackage: [
-    { required: true, message: '请输入标签生产线代码', trigger: 'blur' }
+  //   { required: true, message: '请输入标签生产线代码', trigger: 'blur' }
-  ],
+  // ],
 })
 export const BalancePackage = useCrudSchemas(reactive<CrudSchema[]>([
   {

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

@@ -350,8 +350,10 @@ const labelType = ref('') // 标签类别 采购还是制造等
 const labelPointFormRef = ref()
 const detatableData1 = ref([])
 const handlePoint = async (row) => {
-  await getLabelDetailPage(row,false)
+  const row1 = cloneDeep(row)
-  labelPointFormRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
+  await getLabelDetailPage(row1, false)
+  console.log(row1)
+  labelPointFormRef.value.open('create', row1, null, 'createLabel') //创建标签页面 createLabel 标题
 }
 
 const searchTableRef = ref()
@@ -385,7 +387,7 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
     code: row.itemCode,
     sort: '',
     by: 'ASC',
-  }).then(res => {
+  }).then(async res => {
     if (res.list.length > 0) {
       // 判断物料 可采购
       detailListTableColumnsRules.value = cloneDeep(detailListTableColumnsRules)
@@ -394,37 +396,38 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
         detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage')
         delete detailListTableColumnsRules.value.productionLineCodePackage
         // 修改 tableform 属性
-        detailListTableColumns.tableFormColumns.map(itemColumns => {
+        await SupplieritemApi.getSupplieritemPage({
-            if(itemColumns.field == 'supplierItemCode') {
-              SupplieritemApi.getSupplieritemPage({
           pageSize: 10,
           pageNo: 1,
           itemCode: row.itemCode,
           sort: '',
           by: 'ASC',
         }).then(response => {
-                  row.supplierItemCode = response.list[0].supplierCode
+            detailListTableColumns.tableFormColumns.map(itemColumns => {
-              })
+            if(itemColumns.field == 'supplierItemCode') {
+              row.supplierItemCode = response?.list[0]?.supplierCode
             }
           })
+            
+        })
       }
       // 判断物料 可制造
       if (res.list[0].enableMake == "TRUE") {
         // 修改 tableform 属性
-        detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item=>item.field != 'supplierItemCode')
+        detailListTableColumns.tableFormColumns = BalancePackage.allSchemas.tableFormColumns.filter(item => item.field != 'supplierItemCode')
        delete detailListTableColumnsRules.value.supplierItemCode
-          detailListTableColumns.tableFormColumns.map(itemColumns => {
+        await ProductionlineitemApi.getProductionlineitemPage({
-            if(itemColumns.field == 'productionLineCodePackage') {
-              ProductionlineitemApi.getProductionlineitemPage({
           pageNo: 1,
           itemCode: row.itemCode,
           sort: '',
           by: 'ASC',
         }).then(response => {
-                row.productionLineCodePackage = response.list[0].productionLineCode
+          detailListTableColumns.tableFormColumns.map(itemColumns => {
-              })
+            if(itemColumns.field == 'productionLineCodePackage') {
+              row.productionLineCodePackage = response?.list[0]?.productionLineCode
             }
           })
+        })
       }
     } else {
       message.warning('没有查询到物料代码：【' + row.itemCode + '】')

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue

@@ -222,6 +222,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             newRow['uom'] = item['uom']
             newRow['singlePrice'] = itemCode ? itemCode['price'] : ''
             newRow['amount'] = newRow['qty'] * newRow['singlePrice']
+            newRow['inventoryQty'] = item['qty']
             tableData.value.push(newRow)
           })
           // row['singlePrice'] = res.price
@@ -725,6 +726,13 @@ const submitForm = async (formType, submitData) => {
     item.amount = Number(item.amount).toFixed(2)
   })
   try {
+    const cmdExists = data.subList.some(filter =>
+      parseFloat(filter.inventoryQty) < parseFloat(filter.qty)
+    );
+    if(cmdExists){
+      message.warning("数量不能大于库存数量")
+      return
+    }
     if (formType === 'create') {
       console.log('【报废出库子列表】', data.subList)
       if (data.subList.length == 0) {

src/views/wms/inventoryjobManage/scrap/scrapRequestMain/scrapRequestMain.data.ts

@@ -1144,6 +1144,21 @@ export const ScrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
   //     disabled: true
   //   }
   // },
+  {
+    label: '库存数量 ',
+    field: 'inventoryQty',
+    sort: 'custom',
+    isSearch: false,
+    isTable: false,
+    tableForm: {
+      disabled: true
+    },
+    form:{
+      componentProps:{
+        disabled:true
+      }
+    }
+  },
   {
     label: '数量',
     field: 'qty',

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@@ -688,6 +688,10 @@ const openForm = async (type: string, row?: number) => {
         itemColumns.componentProps.isSearchList = false
         itemColumns.componentProps.disabled = true
       }
+      if (itemColumns.field == 'productionLineCode' || itemColumns.field == 'productionLineCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
     })
   } else {
     // 修改 tableform 属性

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

@@ -567,6 +567,10 @@ const openForm =async (type: string, row?: number) => {
         itemColumns.componentProps.isSearchList = false
         itemColumns.componentProps.disabled = true
       }
+      if (itemColumns.field == 'productionLineCode' || itemColumns.field == 'productionLineCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
     })
   } else {
     // 修改 tableform 属性

src/views/wms/supplierManage/purchaseClaim/purchaseClaimRecord/index.vue

@@ -181,7 +181,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
 const HeadButttondata = [
   defaultButtons.defaultAddBtn({ hasPermi: `wms:purchaseClaimRecord:create` }), // 新增
   defaultButtons.defaultImportBtn({ hasPermi: `wms:purchaseClaimRecord:import` }), // 导入
-  defaultButtons.defaultExportBtn({ hasPermi: `wms:purchaseClaimRecord:export` }), // 导出
+  defaultButtons.defaultExportBtn(null), // 导出
   defaultButtons.defaultFreshBtn(null), // 刷新
   defaultButtons.defaultFilterBtn(null), // 筛选
   defaultButtons.defaultSetBtn(null) // 设置