Merge branch 'hella_online_20241212' into master_hella

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

@@ -424,6 +424,8 @@ const butttondata = (row,$index) => {
     ]
 }
 
+const enableMake = ref('')
+
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
@@ -515,6 +517,7 @@ const buttonTableClick = async (val, row) => {
         by: 'ASC',
       }).then(res => {
         if (res.list.length > 0) {
+          enableMake.value = res.list[0].enableMake
           // 判断物料 可采购 可制造
           if (res.list[0].enableMake == "FALSE") {
             // 修改 tableform 属性
@@ -547,6 +550,7 @@ const buttonTableClick = async (val, row) => {
           })
           }
         } else {
+          enableMake.value = ''
           message.warning('没有查询到物料代码：【' + item.itemCode + '】')
           return
         }
@@ -724,17 +728,21 @@ const submitFormLabel = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
-  let flag = true
+
-  detatableData.tableList.forEach(item => {
+  // 判断物料 可采购 可制造
-    if(!item.supplierItemCode){
+  if (enableMake.value == "FALSE") {
-      flag = false
+    
+    let flag = true
+    detatableData.tableList.forEach(item => {
+      if(!item.supplierItemCode){
+        flag = false
+      }
+    });
+    if(!flag){
+      message.error('请填写供应商代码')
+      return
     }
-  });
-  if(!flag){
-    message.error('请填写供应商代码')
-    return
   }
-  
   try {
     detatableData.tableList.forEach(async (item) => {
       await PackageApi.createPackageLabel({...item,toLocationCode:item.fromLocationCode}).then(res => {

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

@@ -749,7 +749,7 @@ export const ProductionreturnRequestDetailNoLabel = useCrudSchemas(reactive<Crud
       disabled:true,
       // isInpuFocusShow: true,
       searchListPlaceholder: '请选择物料代码', // 输入框占位文本
-      searchField: 'itemCode', // 查询弹窗赋值字段
+      searchField: 'productionLineCode', // 查询弹窗赋值字段
       searchTitle: '生产线物料关系信息', // 查询弹窗标题
       searchAllSchemas: Productionlineitem.allSchemas, // 查询弹窗所需类
       searchPage: ProductionlineitemApi.getProductionlineitemPage, // 查询弹窗所需分页方法

src/views/wms/issueManage/productionscrap/productionscrapRequestMain/index.vue

@@ -261,7 +261,6 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
           } else {
             row['batch'] = '000000'
           }
-          row['maxQty'] = val[0]['qty']
           let param = {'itemCodes':val[0]['itemCode']}
           let resyStdcost = await StdcostpriceApi.queryStdcostpriceByItemCode(param)
           console.log('resyStdcost',resyStdcost)

src/views/wms/issueManage/productionscrap/productionscrapRequestMain/productionscrapRequestMain.data.ts

@@ -1822,7 +1822,7 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       type: 'InputNumber',
       min: 0,
       precision: 2,
-      maxField:'maxQty'
+      // maxField:'maxQty'
     }
   },
   {
@@ -2207,7 +2207,14 @@ export const ProductionscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     isTableForm:false,
   }
 ]))
-
+const validateQty = (rule: any, value: any, callback: any,a,b) => {
+  console.log('validateQty',rule, value,a,b)
+  if (!value) {
+      callback(new Error('数量必须大于0'));
+  } else {
+      callback();
+  }
+}  
 //表单校验
 export const ProductionscrapRequestDetailRules = reactive({
   workStationCode: [
@@ -2225,6 +2232,10 @@ export const ProductionscrapRequestDetailRules = reactive({
   remark:  [
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
+  qty:  [
+    { validator: validateQty, trigger: 'change' }
+  ],
+  
   // packUnit: [
   //   { required: true, message: '请选择包装规格', trigger: 'blur' }
   // ]