Merge branch 'hella_online_20240828' into master_hella

src/views/qms/inspectionRecord/index.vue

@@ -281,13 +281,13 @@ const buttonTableClick = async (val, row) => {
     // 编辑
     // 评估代码值是1，接收时候，使用决策下拉列表是全部合格
     if (row.estimateCode == 1) {
-      InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => {
+      InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => {
         if (itemColumn.field == 'useDecision') {
           itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value == 1)
         }
       })
     } else if (row.estimateCode == 2) {
-      InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => {
+      InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => {
         if (itemColumn.field == 'useDecision') {
           itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value != 1)
         }
@@ -430,7 +430,10 @@ const submitForm = async (formType, data) => {
       message.success(t('common.updateSuccess'))
     }
     formRef.value.dialogVisible = false
+    if (!data.isPublished) {
       handleOrderPub(rowData.value)
+    }
+
     // 刷新当前列表
     getList()
   } finally {

src/views/qms/inspectionRecord/useAddForm.vue

@@ -140,7 +140,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any
     if(row.estimateCode == 1){
       data.value.useDecision = '1'
     }else{
-      data.value.useDecision =''
+      data.value.useDecision =row.useDecision?row.useDecision:''
     }
     // 全部合格时合格数量==数量
     if(data.value.useDecision == 1){

src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts

@@ -952,13 +952,15 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6
+        max:9999,
+        // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      max:9999,
+      // precision: 6
     }
   },
   {

src/views/wms/deliversettlementManage/deliver/deliverRequestMain/deliverRequestMain.data.ts

@@ -867,13 +867,15 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6
+        max:9999,
+        // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      max:9999,
+      // precision: 6
     }
   },
   {

src/views/wms/deliversettlementManage/deliverplan/deliverPlanMain/deliverPlanMain.data.ts

@@ -658,13 +658,15 @@ export const DeliverPlanDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6
+        max:9999,
+        // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      max:9999,
+      // precision: 6
     }
   },
   {
@@ -966,13 +968,15 @@ export const DeliverPlanDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6
+        max:9999,
+        // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      max:9999,
+      // precision: 6
     }
   },
   {

src/views/wms/deliversettlementManage/saleShipmentMainRequest/index.vue

@@ -97,6 +97,7 @@ import Detail from '@/components/Detail/src/Detail.vue'
 import { formatDate } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 const { loadStart, loadDone } = usePageLoading()
+// 结算出库申请
 defineOptions({ name: 'SaleShipmentMain' })
 
 const message = useMessage() // 消息弹窗
@@ -248,7 +249,7 @@ const butttondata = (row,$index) => {
     defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:refused'}), // 驳回
     defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:sale-shipment-main-request:agree'}), // 审批通过
     defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:sale-shipment-main-request:handle'}), // 处理
-    defaultButtons.mainListAbortBtn({hide:isShowMainButton(row,['8']),hasPermi:'wms:sale-shipment-main-request:abort'}), // 终止
+    // defaultButtons.mainListAbortBtn({hide:isShowMainButton(row,['8']),hasPermi:'wms:sale-shipment-main-request:abort'}), // 终止
     // defaultButtons.mainListDeleteBtn({hasPermi:'wms:sale-shipment-main-request:delete'}), // 删除
   ]
 }
@@ -323,7 +324,7 @@ const buttonTableClick = async (val, row) => {
       tableObject.loading = false
       console.log(err)
     })
-  } else if (val == 'mainAbort') { // 废弃
+  } else if (val == 'mainAbort') { // 结算出库废弃
     await message.confirm('确认要终止吗？')
     tableObject.loading = true
     SaleShipmentMainApi.abort(row.masterId).then(() => {

src/views/wms/deliversettlementManage/saleShipmentMainRequest/saleShipmentMain.data.ts

@@ -361,7 +361,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
         isMainValue: false
       },
       {
-        key: 'customer_code',
+        key: 'customerCode',
         value: 'customerCode',
         isMainValue: true
       }]
@@ -381,7 +381,7 @@ export const SaleShipmentDetail = useCrudSchemas(reactive<CrudSchema[]>([
           isMainValue: false
         },
         {
-          key: 'customer_code',
+          key: 'customerCode',
           value: 'customerCode',
           isMainValue: true
         }]

src/views/wms/deliversettlementManage/stockup/stockupMainRequest/stockupMainRequest.data.ts

@@ -742,7 +742,8 @@ export const StockupDetailRequest = useCrudSchemas(reactive<CrudSchema[]>([
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      max:9999,
+      // precision: 6
     },
   },
   {

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

@@ -761,14 +761,14 @@ export const ScrapJobMainRules = reactive({
  * @returns {Array} 报废出库任务子表
  */
 export const ScrapJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
+  // {
-    label: '单据号',
+  //   label: '单据号',
-    field: 'number',
+  //   field: 'number',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 180
+  //     width: 180
-    },
+  //   },
-  },
+  // },
   {
     label: '物料代码',
     field: 'itemCode',

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

@@ -544,14 +544,14 @@ export const ScrapRecordMainRules = reactive({
  * @returns {Array} 报废出库记录子表
  */
 export const ScrapRecordDetail = useCrudSchemas(reactive<CrudSchema[]>([
-  {
+  // {
-    label: '单据号',
+  //   label: '单据号',
-    field: 'number',
+  //   field: 'number',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 180
+  //     width: 180
-    },
+  //   },
-  },
+  // },
   {
     label: '物料代码',
     field: 'itemCode',

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

@@ -840,13 +840,15 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6
+        max:9999,
+        // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      max:9999,
+      // precision: 6
     },
   },
   {

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

@@ -839,13 +839,15 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6
+        max:9999,
+        // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      max:9999,
+      // precision: 6
     },
   },
   {

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

@@ -804,13 +804,15 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6
+        max:9999,
+        // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      max:9999,
+      // precision: 6
     },
   },
   {

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

@@ -792,13 +792,15 @@ export const ProductionDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6
+        max:9999,
+        // precision: 6
       }
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      max:9999,
+      // precision: 6
     },
   },
   {

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

@@ -203,7 +203,7 @@ const butttondata = (row,$index) => {
   // defaultButtons.mainInspectRequestBtn({hasPermi:'wms:productreceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainInspectRequestBtn({hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainListPointBtn(null), // 标签打印
-  // defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示
+  defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示
 ]
 }
 

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

@@ -231,6 +231,24 @@ export const ProductreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     },
     isTable: false,
   },
+  {
+    label: '是否已撤销',
+    field: 'recoveryRequestFlag',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    detail:{
+      dictType:'primary',
+      valueFilter:(value)=>{
+        if(value=='TRUE'){
+          return `是`
+        }else{
+          return '否'
+        }
+      }
+    }
+  },
   {
     label: '创建者',
     field: 'creator',
@@ -569,24 +587,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
   },
-  {
+  
-    label: '是否已撤销',
-    field: 'recoveryRequestFlag',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    detail:{
-      dictType:'primary',
-      valueFilter:(value)=>{
-        if(value=='TRUE'){
-          return `是`
-        }else{
-          return '否'
-        }
-      }
-    }
-  },
   {
     label: '单据号',
     field: 'number',
@@ -760,7 +761,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false ,
     table: {
-      width: 280,
+      width: 340,
       fixed: 'right'
     },
     isTableForm:true,

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

@@ -802,7 +802,7 @@ const tableFormButton = async (val, row) => {
     bomModelVisible.value = true
     DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
-      masterId: row.masterId
+      number: row.number
     }
     await getDetailListBom()
   }

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

@@ -1105,13 +1105,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6
+        max:9999,
+        // precision: 6
       },
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      max:9999,
+      // precision: 6
     }
   },
   {

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

@@ -240,7 +240,7 @@ const butttondata = (row,$index) => {
   defaultButtons.mainInspectRequestBtn({hasPermi:'wms:purchasereceipt-record-main:createInspectRequest',hide:row.inspectRequestFlag == "FALSE" }),// 生成到货检验申请
   defaultButtons.mainPutawayRequestCpBtn({hasPermi:'wms:purchasereceipt-record-main:createPutawayRequest',hide:row.putawayRequestFlag == "FALSE" }),// 生成采购上架申请
   defaultButtons.mainListPointBtn(null), // 标签打印
-  // defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示
+  defaultButtons.mainListRecoveryBtn({hide:row.recoveryRequestFlag == "TRUE" }), // 制品回收 //recoveryRequestFlag==TRUE不展示
   ]
 }
 

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

@@ -765,7 +765,7 @@ export const ProductreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>(
     isDetail: false,
     isForm: false ,
     table: {
-      width: 350,
+      width: 410,
       fixed: 'right'
     },
     hiddenInMain: false,

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

@@ -709,7 +709,7 @@ const tableFormButton = async (val , row) => {
     bomModelVisible.value = true
     DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
-      masterId: row.masterId
+      number: row.number
     }
     await getDetailListBom()
   }

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/productreceiptscrapRequestMain.data.ts

@@ -1172,13 +1172,15 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6
+        max:9999,
+        // precision: 6
       },
     },
     tableForm: {
       type: 'InputNumber',
       min: 0,
-      precision: 6
+      max:9999,
+      // precision: 6
     }
   },
   {

src/views/wms/productionManage/productscrap/productscrapRequestMain/productscrapRequestMain.data.ts

@@ -943,14 +943,16 @@ export const ProductscrapRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       component: 'InputNumber',
       componentProps: {
         min: 0,
-        precision: 6
+        max:9999,
+        // precision: 6
       },
     },
     tableForm: {
       type: 'InputNumber',
       default:1,
       min: 0,
-      precision: 6
+      max:9999,
+      // precision: 6
     }
   },
   {