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

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

@@ -895,24 +895,24 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
       }
     }
   },
-  {
+  // {
-    label: '承运商',
+  //   label: '承运商',
-    field: 'carrierCode',
+  //   field: 'carrierCode',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
-  {
+  // {
-    label: '运输方式',
+  //   label: '运输方式',
-    field: 'transferMode',
+  //   field: 'transferMode',
-    sort: 'custom',
+  //   sort: 'custom',
-    dictType: DICT_TYPE.TRANSFER_MODE,
+  //   dictType: DICT_TYPE.TRANSFER_MODE,
-    dictClass: 'string',
+  //   dictClass: 'string',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-  },
+  // },
   {
     label: '库存状态',
     field: 'inventoryStatus',
@@ -997,41 +997,41 @@ export const DeliverRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     isTableForm: false,
     isForm: false,
   },
-  {
+  // {
-    label: '备注',
+  //   label: '备注',
-    field: 'remark',
+  //   field: 'remark',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isTable: false,
+  //   isTable: false,
-  },
+  // },
-  {
+  // {
-    label: '计划数量',
+  //   label: '计划数量',
-    field: 'planQty',
+  //   field: 'planQty',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isTable: false,
+  //   isTable: false,
-    tableForm: {
+  //   tableForm: {
-      disabled: true
+  //     disabled: true
-    },
+  //   },
-    isForm: false,
+  //   isForm: false,
-  },
+  // },
-  {
+  // {
-    label: '已收货数量',
+  //   label: '已收货数量',
-    field: 'shippedQty',
+  //   field: 'shippedQty',
-    sort: 'custom',
+  //   sort: 'custom',
-    table: {
+  //   table: {
-      width: 150
+  //     width: 150
-    },
+  //   },
-    isTable: false,
+  //   isTable: false,
-    tableForm: {
+  //   tableForm: {
-      disabled: true
+  //     disabled: true
-    },
+  //   },
-    isForm: false,
+  //   isForm: false,
-  },
+  // },
   {
     label: '创建时间',
     field: 'createTime',

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

@@ -71,7 +71,7 @@ import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import * as EquipmentInspectionRecordMainApi from "@/api/eam/equipmentInspectionRecordMain";
 import { formatDate } from '@/utils/formatTime'
-
+// 包装信息
 defineOptions({ name: 'package' })
 
 const message = useMessage() // 消息弹窗
@@ -193,26 +193,26 @@ const handleSelectionPoint = async ()=>{
     text: 'loading...',
     background: 'rgba(0, 0, 0, 0.7)'
   })
-  // InventoryinitRecordDetailApi.printLabelBatchByIdSelection(rows.join(",")).then(res => {
+  PackageApi.batchPrintingLable(rows).then(res => {
-  //   console.log('批量打印res',res);
+    console.log('批量打印res',res);
-  //   getLoading?.close()
+    getLoading?.close()
-  //   if(res.zzLabel){
+    if(res.zzLabel){
-  //     //制造标签
+      //制造标签
-  //     const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-  //     window.open(src.value+'&asn_number='+res.zzLabel)
+      window.open(src.value+'&asn_number='+res.zzLabel)
-  //   }
+    }
-  //   if (res.cgLabel) {
+    if (res.cgLabel) {
-  //     //采购标签
+      //采购标签
-  //     const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-  //     window.open(src.value+'&asn_number='+res.cgLabel)
+      window.open(src.value+'&asn_number='+res.cgLabel)
-  //   }
+    }
-  //   if(!res.cgLabel&&!res.zzLabel){
+    if(!res.cgLabel&&!res.zzLabel){
-  //     message.warning('包装不存在，无法打印或者是线边物料数据不生成包装!')
+      message.warning('包装不存在，无法打印或者是线边物料数据不生成包装!')
-  //   }
+    }
-  // }).catch(err => {
+  }).catch(err => {
-  //   console.log(err)
+    console.log(err)
-  //   getLoading?.close()
+    getLoading?.close()
-  // })
+  })
   
 }
 
@@ -359,28 +359,46 @@ const formsSuccess = async (formType,data) => {
 const labelType = ref('') // 标签类别 采购还是制造等
 const handlePoint = async (row) => {
   console.log(row.packingNumber,445555555555555);
-  PackageApi.getBalanceToPackage(row.number).then(res => {
+  PackageApi.batchPrintingLable([row.number]).then(res => {
-    console.log(777,res);
+    console.log('批量打印res',res);
-    if (res.productionLineCode != null) {
+    if(res.zzLabel){
-      labelType.value = 'zz'
+      //制造标签
-    } else {
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-      labelType.value = 'cg'
+      window.open(src.value+'&asn_number='+res.zzLabel)
     }
-    PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
+    if (res.cgLabel) {
-      console.log(159,resLable )
+      //采购标签
-      // 判断是采购还是制造
-      if (labelType.value == 'cg') {
       const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-        console.log(159,resLable )
+      window.open(src.value+'&asn_number='+res.cgLabel)
-        window.open(src.value+'&asn_number='+resLable)
+    }
-      } else {
+    if(!res.cgLabel&&!res.zzLabel){
-        const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      message.warning('包装不存在，无法打印或者是线边物料数据不生成包装!')
-        window.open(src.value+'&asn_number='+resLable)
     }
-    })
   }).catch(err => {
     console.log(err)
   })
+  // PackageApi.getBalanceToPackage(row.number).then(res => {
+  //   console.log(777,res);
+  //   if (res.productionLineCode != null) {
+  //     labelType.value = 'zz'
+  //   } else {
+  //     labelType.value = 'cg'
+  //   }
+  //   PackageApi.batchPrintingLable((res.number)).then((resLable) =>{
+  //     console.log(159,resLable )
+  //     // 判断是采购还是制造
+  //     if (labelType.value == 'cg') {
+  //       const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+  //       console.log(159,resLable )
+  //       window.open(src.value+'&asn_number='+resLable)
+  //     } else {
+  //       const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+  //       window.open(src.value+'&asn_number='+resLable)
+  //     }
+  //   })
+  // }).catch(err => {
+  //   console.log(err)
+  // })
 }
 
 /** 导入 */

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

@@ -115,6 +115,7 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
+    isSearch: true,
     form: {
       component: 'DatePicker',
       componentProps: {

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

@@ -564,11 +564,13 @@ export const InventorychangeRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     form: {
       component: 'InputNumber',
       componentProps: {
+        disabled:true,
         min:0,
         precision: 6
       }
     },
     tableForm: {
+      disabled:true,
       type: 'InputNumber',
       min:0,
       precision: 6

src/views/wms/productionManage/productreceiptscrap/productreceiptscrapRequestMain/index.vue

@@ -59,7 +59,21 @@
     @tableSelectionDelete="tableSelectionDelete"
     @searchTableSuccess="searchTableSuccess"
     @submitForm="submitForm"
+  >
+  <template v-slot="{ row }">
+      <el-date-picker
+        v-bind:modelValue="
+          row['expireTime']
+            ? addDay(row['produceDate'], row['expireTime'])
+            : dayjs('2099-12-31').valueOf()
+        "
+        :clearable="true"
+        style="width: 100%"
+        :disabled="true"
+        :placeholder="t('ts.选择日期')"
       />
+    </template>
+  </BasicForm>
 
   <!-- 详情 -->
   <Detail
@@ -142,9 +156,12 @@ import {
 } from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts'
 import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { formatDate } from '@/utils/formatTime'
+import dayjs from 'dayjs'
+import { addDay } from '@/utils/formatTime'
 
 // 制品收货申请
 // 隔离报工申请
+// 隔离收货申请
 defineOptions({ name: 'ProductreceiptRequestMain' })
 
 const message = useMessage() // 消息弹窗
@@ -221,6 +238,12 @@ const searchTableSuccess = async (formField, searchField, val, formRef, type, ro
             row['bomVersion'] = res.list[0].version
           }
         })
+        // 生产日期默认带入当前系统日期 史吏
+        row['produceDate'] = dayjs().valueOf()
+        if(res.length>0){
+          row['expireTime'] = res[0]['expireTime']
+        }
+        
       }else if(formField == 'workStationCode'){
         //添加明细
         val.forEach(item=>{
@@ -595,7 +618,13 @@ const submitForm = async (formType, submitData) => {
   if(data.masterId){
     data.id = data.masterId
   }
+  
   data.subList = tableData.value // 拼接子表数据参数
+  tableData.value.forEach((row, index) => {
+    row['expireDate'] = row['expireTime']
+      ? addDay(row['produceDate'], row['expireTime']).valueOf()
+      : dayjs('2099-12-31').valueOf()
+  })
   if(data.subList.find(item => (item.qty <= 0))) {
     message.warning('数量必须大于0')
     return

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

@@ -1238,7 +1238,8 @@ export const ProductreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 180
     },
     tableForm: {
-      type: 'FormDate',
+      type: 'slot',
+      disabled: true,
       valueFormat: 'x',
     },
     form: {

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

@@ -510,12 +510,12 @@ const blurOne = (oneRow, twoRow) => {
   if (!twoRow.xNumber) {
     twoRow.qtyOne = ''
   }
-  // if (parseFloat(twoRow.xNumber) > parseFloat(oneRow.otherNumber)) {
+  if (parseFloat(twoRow.xNumber) > parseFloat(oneRow.otherNumber)) {
-  //   message.warning('每托箱个数最多' + oneRow.otherNumber + '箱')
+    message.warning('每托箱个数最多' + oneRow.otherNumber + '箱')
-  //   twoRow.xNumber = oneRow.otherNumber
+    twoRow.xNumber = oneRow.otherNumber
-  //   twoRow.children = []
+    twoRow.children = []
-  //   twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
+    twoRow.qtyOne = parseFloat(twoRow.xNumber) * parseFloat(oneRow.packQty)
-  // }
+  }
   twoRow.qtyOne = parseFloat(twoRow.xNumber)
     ? accuracyFun.multiply(parseFloat(twoRow.xNumber), parseFloat(oneRow.packQty))
   : ''