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

src/locales/en-US.ts

@@ -1316,7 +1316,8 @@ export default {
     是否确认分摊金额: 'Do you want to confirm the allocation amount?',
     创建开票申请: 'Create an invoice request?',
     详情:'Detail',
-    退回:'Return'
+    退回:'Return',
+    作废成功:'Invalid successfully'
   },
 
 

src/locales/zh-CN.ts

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

src/views/wms/basicDataManage/strategySetting/strategy/downShelfStrategy/AddForm.vue

@@ -654,7 +654,9 @@ const searchTransactionType = ()=>{
   )
 }
 // 失去焦点校验
-const blurVerify= async (type)=>{
+const typeBlur = ref('')
+const blurVerify = async (type) => {
+  typeBlur.value = type
   let transactionType = formData.value.condition.find(item => item['ParamCode'] == type)
   console.log(transactionType)
   if (transactionType && transactionType.Value) {
@@ -864,6 +866,8 @@ defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
   await blurWarehouse()
+  await blurVerify(typeBlur.value)
+  
   console.log('规则条件',formData.value.condition)
   
   // 校验表单

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

@@ -416,6 +416,7 @@ export const SupplieritemRules = reactive({
     { required: true, message: '请输入物料代码', trigger: 'change' }
   ],
   supplierItemCode: [
+    { required: true, message: '请输入供应商物料代码', trigger: 'change' },
     { max: 50, message: '不得超过50个字符', trigger: 'blur' },
     // { validator:validateYS, message: '请输入正确的代码', trigger: 'blur'}
   ],

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

@@ -441,7 +441,7 @@ const getLabelDetailPage = async (row, useToPackingNumber) => {
       item.batch = formatDate(new Date(),'YYYYMMDD')
       item['disabled_batch'] = false
     } else {
-      item['disabled_batch'] = true
+      item['disabled_batch'] = false
     }
   })
   // searchTableRef.value.openData('标签信息', tableObjectPrint, { tableColumns }, true)
@@ -581,7 +581,7 @@ const pointLabel = async () => {
     packQty:detatableData1.value[0].packQty,
     uom:detatableData1.value[0].uom,
     productionLineCodePackage:detatableData1.value[0].productionLineCodePackage,
-    supplierItemCode:detatableData1.value[0].supplierItemCode,
+    supplierCode:detatableData1.value[0].supplierItemCode,
   }
   // const isHave = detatableData1.value.find(item => parseFloat(item.printQty) <= 0)
   if(!parseFloat(obj.printQty) ){
@@ -590,13 +590,13 @@ const pointLabel = async () => {
   }
   await PackageApi.batchPrintingBalanceLableForCreate(obj).then(res => {
     let src =ref('')
-    src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板
-
-    //  if (enableBuyOrenableMake.value == 'enableBuy') {
-    //   src.value = BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id='+res//采购标签模板
-    // } else if(enableBuyOrenableMake.value == 'enableMake') {
     // src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板
-    // }
+
+     if (enableBuyOrenableMake.value == 'enableBuy') {
+      src.value = BASE_URL + '/jmreport/view/1021666059319578624?token=' + getAccessToken()+'&asn_number='+res//采购标签模板
+    } else if(enableBuyOrenableMake.value == 'enableMake') {
+     src.value = BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken()+'&asn_number='+res//制造标签模板
+    }
     window.open(src.value)
   }).catch(err => {
     console.log(err)

src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue

@@ -135,6 +135,7 @@ import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import * as SubjectAccountApi  from '@/api/wms/subjectAccount'
 const { loadStart, loadDone } = usePageLoading()
+import * as ruleApi  from '@/api/wms/rule/index'
 // 计划外入库申请
 defineOptions({ name: 'UnplannedreceiptRequestMain' })
 
@@ -194,6 +195,7 @@ const isItemType = async (itemCode, labelTypeParams) => {
 }
 
 // 查询页面返回
+const fromManagementPrecision = ref('')
 const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => {
   nextTick(async () => {
     console.log('searchTableSuccess',formField, searchField, val, formRef, type, row )
@@ -201,6 +203,21 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
       // 明细查询页赋值
       if(formField == 'toLocationCode'){
         row['toLocationCode'] = val[0]['code']
+        
+        await ruleApi.getManagementPrecision({
+        	itemCodes: [row['itemCode']],
+		      locationCode:val[0]['code']
+        }).then((res) => {
+          fromManagementPrecision.value = res[0].ManagementPrecision
+          if (fromManagementPrecision.value == 'BY_QUANTITY') {
+            // row['disabled_batch'] = false
+            UnplannedreceiptRequestDetailRules.batch[0].required = false
+          
+          } else {
+            // row['disabled_batch'] = true
+            UnplannedreceiptRequestDetailRules.batch[0].required = true
+          }
+        })
       } else if(formField == 'itemCode'){
         let itemCodes = val.filter(item=>tableData.value.find(item1=>item1['itemCode']==item['code']))
         if(itemCodes.length>0){
@@ -525,7 +542,20 @@ const buttonTableClick = async (val, row) => {
           return
         }
       })
+      ruleApi.getManagementPrecision({
+        itemCodes: [item['itemCode']],
+        locationCode:item['toLocationCode']
+      }).then((res) => {
+        fromManagementPrecision.value = res[0].ManagementPrecision
+        if (fromManagementPrecision.value == 'BY_QUANTITY') {
+          item.batch = formatDate(new Date(),'YYYYMMDD')
+          item['disabled_batch'] = false
+        } else {
+          item['disabled_batch'] = true
+        }
       })
+    })
+  
   }
 }
 

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

@@ -1427,6 +1427,9 @@ function validateQty(rule, value, callback) {
 }
 //表单校验
 export const UnplannedreceiptRequestDetailRules = reactive({
+  batch: [
+    { required: true, message: '请选择批次', trigger: ['blur', 'change'] }
+  ],
   arriveDate: [
     { required: true, message: '请选择到货日期', trigger: 'change' }
   ],
@@ -1521,7 +1524,9 @@ export const UnplannedreceiptRequestDetailLabel = useCrudSchemas(reactive<CrudSc
       width: 150
     },
     tableForm: {
-      disabled: true,
+      type: 'FormDate',
+      format: 'YYYYMMDD',
+      valueFormat: 'YYYYMMDD',
     },
     form: {
       componentProps: {
@@ -1762,4 +1767,7 @@ export const UnplannedreceiptRequestDetailLabelRules = reactive({
   packUnit: [
     { required: true, message: '请选择包装规格', trigger: 'change' }
   ],
+  batch: [
+    { required: true, message: '请选择批次', trigger: ['blur', 'change'] }
+  ],
 })

src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue

@@ -90,6 +90,8 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as ProductionlineitemApi from '@/api/wms/productionlineitem'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import { getBaseUrl } from '@/utils/systemParam'
+
 const { loadStart, loadDone } = usePageLoading()
 // 备料计划
 defineOptions({ name: 'PreparetoissueMain' })
@@ -395,8 +397,19 @@ const buttonTableClick = async (val, row) => {
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
     await message.confirm('确认要生成发料申请吗？')
     tableObject.loading = true
-    await PreparetoissueMainApi.generateIssueRequest(row.number).then(() => {
+
+    await PreparetoissueMainApi.generateIssueRequest(row.number).then((res) => {
+      console.log('返回数据',res)
+      if (res.errorCount > 0) {
+        message.confirm('存在物料库存不足，创建失败。').then(() => {
+           window.open(
+            getBaseUrl() + '/admin-api' + res.errorFile,
+            '222'
+          )
+        })
+      } else {
         message.success(t('common.createSuccess'))
+      }
       tableObject.loading = false
       buttonBaseClick('refresh',null)
     }).catch(err => {

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

@@ -94,6 +94,7 @@ import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
 // 生产计划主
 // 预生产计划
+// 补给品生产计划
 defineOptions({ name: 'ProductionMain' })
 
 const message = useMessage() // 消息弹窗

src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts

@@ -640,9 +640,9 @@ export const ProductionMainRules = reactive({
   productionLine: [
     { required: true, message: '请选择生产线', trigger: 'change' }
   ],
-  shift: [
+  // shift: [
-    { required: true, message: '请选择班次', trigger: 'change' }
+  //   { required: true, message: '请选择班次', trigger: 'change' }
-  ],
+  // ],
   // team: [
   //   { required: true, message: '请选择班组', trigger: 'change' }
   // ],

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

@@ -93,6 +93,7 @@ import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
 // 装配计划
+// 号口生产计划
 defineOptions({ name: 'ProductionMainAssemble' })
 
 const message = useMessage() // 消息弹窗

src/views/wms/productionManage/productionplan/productionMainAssemble/productionMainAssemble.data.ts

@@ -639,9 +639,9 @@ export const ProductionMainRules = reactive({
   productionLine: [
     { required: true, message: '请选择生产线', trigger: 'change' }
   ],
-  shift: [
+  // shift: [
-    { required: true, message: '请选择班次', trigger: 'change' }
+  //   { required: true, message: '请选择班次', trigger: 'change' }
-  ],
+  // ],
   // team: [
   //   { required: true, message: '请选择班组', trigger: 'change' }
   // ],

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@@ -611,9 +611,9 @@ export const ProductreceiptRequestMainRules = reactive({
   // team: [
   //   { required: true, message: '请选择班组代码', trigger: 'change' }
   // ],
-  shift: [
+  // shift: [
-    { required: true, message: '请选择班次代码', trigger: 'change' }
+  //   { required: true, message: '请选择班次代码', trigger: 'change' }
-  ],
+  // ],
   // departmentCode: [
   //   { required: true, message: '请输入部门', trigger: 'blur' }
   // ],
@@ -1726,6 +1726,9 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    tableForm: {
+      disabled: true
+    }
   },
   {
     label: '数量',

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts

@@ -617,9 +617,9 @@ export const ProductreceiptRequestMainRules = reactive({
   // team: [
   //   { required: true, message: '请选择班组代码', trigger: 'change' }
   // ],
-  shift: [
+  // shift: [
-    { required: true, message: '请选择班次代码', trigger: 'change' }
+  //   { required: true, message: '请选择班次代码', trigger: 'change' }
-  ],
+  // ],
   // departmentCode: [
   //   { required: true, message: '请输入部门', trigger: 'blur' }
   // ],
@@ -1731,6 +1731,9 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    tableForm: {
+      disabled:true
+    }
   },
   {
     label: '数量',

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

@@ -597,6 +597,8 @@ const searchTableSuccess = (formField, searchField, val, searchFormRef, type, ro
           newRow['maxInvoicableQuantity'] = item['invoicableQuantity']
           newRow['invoicableQuantity'] = item['invoicableQuantity']
           newRow['itemCode'] = item['itemCode']
+          newRow['itemName'] = item['itemName']
+          
           newRow['deliveryDate'] = item['prhRcpDate']
           newRow['arrivalQty'] = item['prhRcvd']
           newRow['id'] = item['id']