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

src/api/wms/package/index.ts

@@ -100,6 +100,10 @@ export const createPackageLabel = async (data: PackageVO) => {
 export const batchPrintingLable = async (data: any) => {
   return await request.post({ url: `/wms/package/batchPrintingLable`, data })
 }
+// 批量打印标签计划外入库申请用的
+export const batchPrintingLableForYT = async (data: any) => {
+  return await request.post({ url: `/wms/package/batchPrintingLableForYT`, data })
+}
 // 获取标签信息
 export const getPrintingLableId = async (data: any) => {
   return await request.put({ url: `/wms/package/getLablesByPackingNumber`, data })

src/components/TableForm/src/TableForm.vue

@@ -100,7 +100,7 @@
                   `ts.${headerItem?.tableForm?.placeholder || '请输入' + headerItem.label}`
                 ).replace('ts.', '')
               "
-              :disabled="disabledInput(headerItem, row)"
+              :disabled="itemIsDisabled(headerItem, row)"
               style="flex: 1"
               @blur="inputStringBlur(headerItem, row[headerItem.field], row, index)"
               @clear="clearInput(headerItem.field, row, index)"
@@ -120,6 +120,7 @@
               :key="headerItem.field + $index + 'button'"
               v-if="headerItem?.tableForm?.isInpuFocusShow  || showInputSearch(headerItem, row)"
               @click="inpuFocus(headerItem, row, index)"
+              :disabled="itemIsDisabled(headerItem, row)"
               ><Icon icon="ep:search" size="14"
             /></el-button>
           </el-form-item>

src/utils/validator.ts

@@ -823,7 +823,15 @@ export function validatePositiveNumber(rule, value, callback){
     callback(new Error('必须是一个正数'));
   }
 }
-
+// 校验带0的正数
+export function validatePositiveNumber0(rule, value, callback) {
+    const numericValue = Number(value);
+    if (numericValue >= 0) {
+        callback();
+    } else {
+        callback(new Error('必须是一个正数'));
+    }
+}
 export default {
     validateCode,
     validateEmail,
@@ -858,5 +866,6 @@ export default {
     validateMaxNumber5,
     validatePercent,
     validateNumSix,
-    validateSixNum
+    validateSixNum,
+    validatePositiveNumber0
 }

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

@@ -24,6 +24,12 @@ import { QadProject } from '@/views/wms/basicDataManage/subject/qadProject/qadPr
 import * as QadProjectApi from '@/api/wms/qadProject'
 import * as BusinesstypeApi from '@/api/wms/businesstype'
 
+import * as SupplieritemApi from '@/api/wms/supplieritem'
+import { Supplieritem } from '@/views/wms/basicDataManage/supplierManage/supplieritem/supplieritem.data'
+
+import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
+import { Productionlineitem } from '@/views/wms/basicDataManage/itemManage/productionlineitem/productionlineitem.data'
+
 const businessType = 'UnplannedReceipt'
 const { t } = useI18n() // 国际化
 
@@ -1762,6 +1768,51 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
       disabled: true,
     }
   },
+  {
+    label: '标签生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'productionLineCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'itemCode',
+        value: 'itemCode',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '标签供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
+  },
 ]))
 
 //表单校验

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@@ -573,11 +573,10 @@ const buttonTableClick = async (val, row) => {
           // 判断物料 可采购
           detailListTableColumnsRules.value = cloneDeep(ProductionreturnRequestDetailLabelRules)
           if (res.list[0].enableBuy == "TRUE") {
-            detailListTableColumns.tableFormColumns = ProductionreturnRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCodePackage')
-            delete detailListTableColumnsRules.value.productionLineCodePackage
+            detailListTableColumns.tableFormColumns = ProductionreturnRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'productionLineCode')
               // 修改 tableform 属性
             detailListTableColumns.tableFormColumns.map(itemColumns => {
-                if(itemColumns.field == 'supplierItemCode') {
+                if(itemColumns.field == 'supplierCode') {
                   SupplieritemApi.getSupplieritemPage({
                     pageSize: 10,
                     pageNo: 1,
@@ -585,7 +584,7 @@ const buttonTableClick = async (val, row) => {
                     sort: '',
                     by: 'ASC',
                   }).then(response => {
-                      item.supplierItemCode = response.list[0].supplierCode
+                      item.supplierCode = response.list[0].supplierCode
                       formLabelRef.value.formLoading = false
                   })
                 }
@@ -594,17 +593,16 @@ const buttonTableClick = async (val, row) => {
           // 判断物料 可制造
           if (res.list[0].enableMake == "TRUE") {
             // 修改 tableform 属性
-            detailListTableColumns.tableFormColumns = ProductionreturnRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'supplierItemCode')
-            delete detailListTableColumnsRules.value.supplierItemCode
+            detailListTableColumns.tableFormColumns = ProductionreturnRequestDetailLabel.allSchemas.tableFormColumns.filter(item=>item.field != 'supplierCode')
               detailListTableColumns.tableFormColumns.map(itemColumns => {
-                if(itemColumns.field == 'productionLineCodePackage') {
+                if(itemColumns.field == 'productionLineCode') {
                   ProductionlineitemApi.getProductionlineitemPage({
                     pageNo: 1,
                     itemCode: item.itemCode,
                     sort: '',
                     by: 'ASC',
                   }).then(response => {
-                    item.supplierItemCode = response.list[0].supplierCode
+                    item.productionLineCode = response.list[0].productionLineCode
                     formLabelRef.value.formLoading = false
                   })
                 }
@@ -729,7 +727,7 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
   if (array1.length > 0) {
     await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
       console.log(res)
-      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
       window.open(src.value + '&asn_number=' + res)
     }).catch(err => {
       console.log(err)
@@ -908,7 +906,7 @@ const handlePoint = async (row) => {
   }).then((res) => {
     if(res.list.length > 0) {
       isCreateLabel.value = true
-      if (res.list[0].supplierItemCode != null) {
+      if (res.list[0].supplierCode != null) {
         labelType.value = 'cg'
       } else if(res.list[0].productionLineCode != null){
         labelType.value = 'zz'

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -1408,51 +1408,7 @@ export const ProductionreturnRequestDetailRules = reactive({
  * @returns {Array} 生产退料申请子表创建标签
  */
 export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '标签生产线代码',
-    field: 'productionLineCodePackage',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      disabled: true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
-      searchField: 'productionLineCode', // 查询弹窗赋值字段
-      searchTitle: '生产线物料关系信息', // 查询弹窗标题
-      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
-      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'itemCode',
-        value: 'itemCode',
-        isMainValue: true
-      }]
-    }
-  },
-  {
-    label: '标签供应商代码',
-    field: 'supplierItemCode',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      enterSearch:true,
-      isInpuFocusShow: true,
-      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
-      searchField: 'supplierCode', // 查询弹窗赋值字段
-      searchTitle: '供应商信息', // 查询弹窗标题
-      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
-      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
-      searchCondition:[{
-        key: 'itemCode',
-        value: 'itemCode',
-        message: '请填写物料代码！',
-        isMainValue: true
-      }]
-    }
-  },
+ 
   {
     label: '物料代码',
     field: 'itemCode',
@@ -1663,14 +1619,59 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
       }
     }
   },
+  {
+    label: '标签生产线代码',
+    field: 'productionLineCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择生产线代码', // 输入框占位文本
+      searchField: 'productionLineCode', // 查询弹窗赋值字段
+      searchTitle: '生产线物料关系信息', // 查询弹窗标题
+      searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
+      searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'itemCode',
+        value: 'itemCode',
+        isMainValue: true
+      }]
+    }
+  },
+  {
+    label: '标签供应商代码',
+    field: 'supplierCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      enterSearch: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择供应商代码', // 输入框占位文本
+      searchField: 'supplierCode', // 查询弹窗赋值字段
+      searchTitle: '供应商信息', // 查询弹窗标题
+      searchAllSchemas: Supplieritem.allSchemas, // 查询弹窗所需类
+      searchPage: SupplieritemApi.getSupplieritemPage, // 查询弹窗所需分页方法
+      searchCondition: [{
+        key: 'itemCode',
+        value: 'itemCode',
+        message: '请填写物料代码！',
+        isMainValue: true
+      }]
+    }
+  },
 ]))
 
 //表单校验
 export const ProductionreturnRequestDetailLabelRules = reactive({
-  // supplierItemCode: [
+  // supplierCode: [
   //   { required: true, message: '请选择供应商', trigger: 'change' }
   // ],
-  // productionLineCodePackage: [
+  // productionLineCode: [
   //   { required: true, message: '请选择生产线', trigger: 'change' }
   // ],
   batch: [

src/views/wms/moveManage/inventorychange/inventorychangeRecordMain/inventorychangeRecordMain.data.ts

@@ -314,14 +314,14 @@ export const InventorychangeRecordMainRules = reactive({
  * @returns {Array} 库存修改记录子表
  */
 export const InventorychangeRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-  },
+  // {
+  //   label: '单据号',
+  //   field: 'number',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  // },
   {
     label: '物料代码',
     field: 'itemCode',
@@ -760,9 +760,9 @@ export const InventorychangeRecordDetailRules = reactive({
   areaCode: [
     { required: true, message: '请选择库区代码', trigger: 'change' }
   ],
-  number: [
-    { required: true, message: '请输入单据号', trigger: 'blur' }
-  ],
+  // number: [
+  //   { required: true, message: '请输入单据号', trigger: 'blur' }
+  // ],
   itemCode: [
     { required: true, message: '请选择物料代码', trigger: 'change' }
   ],

src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/inventorychangeRequestMain.data.ts

@@ -370,20 +370,20 @@ export const InventorychangeRequestMainRules = reactive({
  * @returns {Array} 库存修改申请子表
  */
 export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
-    label: '单据号',
-    field: 'number',
-    sort: 'custom',
-    table: {
-      width: 180
-    },
-    isTableForm: false,
-    form: {
-      componentProps: {
-        disabled: true
-      }
-    }
-  },
+  // {
+  //   label: '单据号',
+  //   field: 'number',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 180
+  //   },
+  //   isTableForm: false,
+  //   form: {
+  //     componentProps: {
+  //       disabled: true
+  //     }
+  //   }
+  // },
   {
     label: '从包装号',
     field: 'fromPackingNumber',

src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/inventorymoveRequestMain.data.ts

@@ -1,5 +1,4 @@
 import type { CrudSchema } from '@/hooks/web/useCrudSchemas'
-import { dateFormatter } from '@/utils/formatTime'
 import * as getRequestsettingApi  from '@/api/wms/requestsetting/index'
 
 import * as BalanceApi  from '@/api/wms/balance'

src/views/wms/productionManage/productredress/productredressRequestMain/index.vue

@@ -367,6 +367,10 @@ const openForm =async (type: string, row?: number) => {
         itemColumns.componentProps.isSearchList = false
         itemColumns.componentProps.disabled = true
       }
+      if(itemColumns.field == 'productionLineCode') {
+        itemColumns.componentProps.isSearchList = false
+        itemColumns.componentProps.disabled = true
+      }
     })
   
   } else {
@@ -380,6 +384,10 @@ const openForm =async (type: string, row?: number) => {
         itemColumns.componentProps.isSearchList = true
         itemColumns.componentProps.disabled = false
       }
+      if(itemColumns.field == 'productionLineCode') {
+        itemColumns.componentProps.isSearchList = true
+        itemColumns.componentProps.disabled = false
+      }
     })
   }
   formRef.value.open(type, row)

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

@@ -378,7 +378,7 @@ const getSearchTableData = async (number,formField,searchField)=>{
     // defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入
     // defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出
     defaultButtons.defaultExportDetailsBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出明细
-    defaultButtons.defaultExportTableBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出二维表
+    //defaultButtons.defaultExportTableBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出二维表
     // defaultButtons.mainListSelectionOrderPubBtn(null), // 批量发布
     defaultButtons.defaultFreshBtn(null), // 刷新
     defaultButtons.defaultFilterBtn(null), // 筛选

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

@@ -8,6 +8,7 @@ import { PurchaseDetail, PurchaseMain } from '../purchaseMain/purchaseMain.data'
 import { getPurchaseDetailPagePoNumber } from '@/api/wms/purchaseDetail'
 import * as ItembasicApi from '@/api/wms/itembasic'
 import { Itembasic } from '@/views/wms/basicDataManage/itemManage/itembasic/itembasic.data'
+import { validatePositiveNumber0 } from "@/utils/validator";
 const { t } = useI18n() // 国际化
 
 /**
@@ -994,7 +995,7 @@ export const PurchasePlanDetailRules = reactive({
   uom: [{ required: true, message: '请选择计量单位', trigger: 'change' }],
   planQty: [
     { required: true, message: '请输入计划数量', trigger: 'blur' },
-    { validator: validatePlanQty, message: '计划数量不能小于0', trigger: 'blur' }
+    { validator: validatePositiveNumber0, message: '计划数量不能小于0', trigger: ['blur','change'] }
   ],
   remark: [{ max: 50, message: '不得超过50个字符', trigger: 'blur' }]
 })

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

@@ -1244,7 +1244,6 @@ const documentSrc = ref(BASE_URL + '/jmreport/view/1019060741381099520?token=' +
 // 物料状态是号试显示生准订单的发货单模版
 const documentSrc2 = ref(BASE_URL + '/jmreport/view/1019406772438372352?token=' + getAccessToken())
 const handleDocumentPrint = async (id, stausId) => {
-  debugger
   await SupplierdeliverRequestMainApi.getItemStatus(stausId).then(async (res) => {
     if (res) {
       //号试（生准订单）模板