打印编码需求变更

src/apis/workOrder/workOrder.ts

@@ -8,7 +8,6 @@ export interface WorkOrderResp {
   orderNo: string
   materialName: string
   encoding: string
-  encodingPrint: string
   unitWeight: string
   materialSpec: string
   photoUrl: string
@@ -43,7 +42,6 @@ export interface WorkOrderQuery {
   materialName: string | undefined
   batch: string | undefined
   encoding: string | undefined
-  encodingPrint: string | undefined
   userName: string | undefined
   carNo: string | undefined
   startDate: string | undefined

src/views/barcodePrint/index.vue

@@ -12,9 +12,14 @@
                 <a-input v-model="formData.materialName" placeholder="未获取到物料名称" :disabled="true" />
               </a-form-item>
             </div>
+            <div class="form-grid-item">
+              <a-form-item label="物料编码">
+                <a-input v-model="formData.encoding" placeholder="未获取到物料编码" :disabled="true" />
+              </a-form-item>
+            </div>
             <div class="form-grid-item">
               <a-form-item label="打印编码（国产替代）">
-                <a-input v-model="formData.encodingPrint" placeholder="未获取到打印编码" :disabled="true" />
+                <a-input v-model="formData.encodingPrint" allow-clear placeholder="请输入打印编码" />
               </a-form-item>
             </div>
             <div class="form-grid-item">
@@ -298,7 +303,7 @@ const generateDetailLabel = async () => {
     for (const workOrderInfo of formData.workOrderInfos) {
       // 计算二维码数据
       const orderNo = formData.orderNo + workOrderInfo.id;
-      const qrCodeData = `10#${formData.encodingPrint}$11#9DP$12#${formData.batch}$17#${workOrderInfo.quantity}$20#${formattedDate2}$31#${orderNo}$DY`
+      const qrCodeData = `10#${formData.encodingPrint || formData.encoding}$11#9DP$12#${formData.batch}$17#${workOrderInfo.quantity}$20#${formattedDate2}$31#${orderNo}$DY`;
       
       // 生成二维码图片
       const qrCodeImage = await generateQRCode(qrCodeData)
@@ -306,7 +311,7 @@ const generateDetailLabel = async () => {
       // 添加标签数据
       labelDataList.push({
         partName: formData.materialName || '',
-        partNumber: formData.encodingPrint || '',
+        partNumber: formData.encodingPrint || formData.encoding || '',
         totalCalculatedWeight: workOrderInfo.calculatedWeight || '',
         totalWeight: workOrderInfo.weight || '',
         productionDate: formattedDate,
@@ -354,7 +359,7 @@ const generateOverallLabel = async () => {
         String(now.getDate()).padStart(2, '0')
     
     // 计算二维码数据
-    const qrCodeData = `10#${formData.encodingPrint}$11#9DP$12#${formData.batch}$17#${formData.totalCount}$20#${formattedDate2}$31#${formData.orderNo}$DY`
+    const qrCodeData = `10#${formData.encodingPrint || formData.encoding}$11#9DP$12#${formData.batch}$17#${formData.totalCount}$20#${formattedDate2}$31#${formData.orderNo}$DY`
     
     // 生成二维码图片
     const qrCodeImage = await generateQRCode(qrCodeData)
@@ -362,7 +367,7 @@ const generateOverallLabel = async () => {
     // 直接从 formData 中获取数据
     Object.assign(labelData, {
       partName: formData.materialName || '',
-      partNumber: formData.encodingPrint || '',
+      partNumber: formData.encodingPrint || formData.encoding || '',
       totalCalculatedWeight: formData.totalCalculatedWeight || '',
       totalWeight: formData.totalWeight || '',
       productionDate: formattedDate,
@@ -391,7 +396,6 @@ onMounted(() => {
     getWorkOrder(workerOrderId).then(res => {
       if (res.code == '0') {
         formData.encoding = res.data.encoding
-        formData.encodingPrint = res.data.encodingPrint
         formData.materialName = res.data.materialName
         formData.orderNo = res.data.orderNo
         formData.batch = res.data.batch

src/views/fullClaim/index.vue

@@ -121,7 +121,6 @@ const columns = ref<TableInstanceColumns[]>([
   { title: '任务工单号', dataIndex: 'orderNo', slotName: 'orderNo' },
   { title: '物料名称', dataIndex: 'materialName', slotName: 'materialName' },
   { title: '物料编码', dataIndex: 'materialCode', slotName: 'materialCode' },
-  { title: '打印编码（国产替代）', dataIndex: 'encodingPrint', slotName: 'encodingPrint' ,width: 120},
   { title: '批次号', dataIndex: 'batch', slotName: 'batch' },
   { title: '数量', dataIndex: 'count', slotName: 'count' },
   { title: '标记号', dataIndex: 'mark', slotName: 'mark' },
@@ -203,7 +202,7 @@ const onPrint = async (record: FullWorkOrderResp) => {
         String(now.getDate()).padStart(2, '0')
 
     // 计算二维码数据
-    const qrCodeData = `10#${record.encodingPrint || record.materialCode || ''}$11#9DP$12#${record.batch || ''}$17#${record.count || ''}$20#${formattedDate2}$31#${record.orderNo || ''}$DY`
+    const qrCodeData = `10#${record.materialCode || ''}$11#9DP$12#${record.batch || ''}$17#${record.count || ''}$20#${formattedDate2}$31#${record.orderNo || ''}$DY`
 
     // 生成二维码图片
     const qrCodeImage = await generateQRCode(qrCodeData)
@@ -262,7 +261,7 @@ const onPrint = async (record: FullWorkOrderResp) => {
                 <td class="label-cell">
                   <div class="label-row">
                     <div class="label-field">零件号</div>
-                    <div class="label-value">${record.encodingPrint || record.materialCode || ''}</div>
+                    <div class="label-value">${record.materialCode || ''}</div>
                   </div>
                 </td>
                 <td class="label-cell">

src/views/material/MaterialInfoAddModal.vue

@@ -59,13 +59,6 @@ const columns: ColumnItem[] = reactive([
     span: 24,
     required: true,
   },
-  {
-    label: '打印编码（国产替代）',
-    field: 'encodingPrint',
-    type: 'input',
-    span: 24,
-    required: true,
-  },
   {
     label: '物料单位重量(g)',
     field: 'unitWeight',

src/views/material/index.vue

@@ -20,7 +20,6 @@
       <template #toolbar-left>
         <a-input-search v-model="queryForm.materialName" placeholder="请输入物料名称" allow-clear @search="search" />
         <a-input-search v-model="queryForm.encoding" placeholder="请输入物料编码" allow-clear @search="search" />
-        <a-input-search v-model="queryForm.encodingPrint" placeholder="请输入打印编码（国产替代）" allow-clear @search="search" style="width: 240px"/>
         <a-input-search v-model="queryForm.batch" placeholder="请输入批次" allow-clear @search="search" />
         <a-button @click="reset">
           <template #icon><icon-refresh /></template>
@@ -120,7 +119,6 @@ const {
 const columns = ref<TableInstanceColumns[]>([
   { title: '物料名称', dataIndex: 'materialName', slotName: 'materialName' },
   { title: '物料编码', dataIndex: 'encoding', slotName: 'encoding' },
-  { title: '打印编码（国产替代）', dataIndex: 'encodingPrint', slotName: 'encodingPrint' },
   { title: '物料照片', dataIndex: 'photoUrl', slotName: 'photoUrl', width: 120, align: 'center' },
   { title: '物料单位重量(g)', dataIndex: 'unitWeight', slotName: 'unitWeight' },
   { title: '物料品类', dataIndex: 'typeName' },

src/views/weightManage/LabelPrint.vue

@@ -10,8 +10,8 @@
             </a-form-item>
           </div>
           <div class="form-grid-item">
-            <a-form-item label="打印编码（国产替代）">
+            <a-form-item label="物料编码">
-              <a-input v-model="formData.encodingPrint" placeholder="未获取到打印编码" :disabled="true" />
+              <a-input v-model="formData.encoding" placeholder="未获取到物料编码" :disabled="true" />
             </a-form-item>
           </div>
           <div class="form-grid-item">
@@ -201,7 +201,6 @@ const props = withDefaults(defineProps<LabelPrintProps>(), {
 const formData = reactive({
   workerOrderId: '',
   encoding: '',
-  encodingPrint: '',
   materialName: '',
   orderNo: '',
   totalCalculatedWeight: '',
@@ -256,7 +255,6 @@ const fetchWorkOrderData = async (workerOrderId: string) => {
     const res = await getWorkOrder(workerOrderId)
     if (res.code == '0') {
       formData.encoding = res.data.encoding
-      formData.encodingPrint = res.data.encodingPrint
       formData.materialName = res.data.materialName
       formData.orderNo = res.data.orderNo
       formData.batch = res.data.batch
@@ -321,14 +319,14 @@ const generateDetailLabel = async () => {
 
     for (const workOrderInfo of formData.workOrderInfos) {
       const orderNo = formData.orderNo + workOrderInfo.id;
-      const qrCodeData = `10#${formData.encodingPrint}$11#9DP$12#${formData.batch}$17#${workOrderInfo.quantity}$20#${formattedDate2}$31#${orderNo}$DY`
+      const qrCodeData = `10#${formData.encoding}$11#9DP$12#${formData.batch}$17#${workOrderInfo.quantity}$20#${formattedDate2}$31#${orderNo}$DY`
 
       const qrCodeImage = await generateQRCode(qrCodeData)
       console.log("========", workOrderInfo.mark);
 
       labelDataList.push({
         partName: formData.materialName || '',
-        partNumber: formData.encodingPrint || '',
+        partNumber: formData.encoding || '',
         totalCalculatedWeight: workOrderInfo.calculatedWeight || '',
         totalWeight: workOrderInfo.weight || '',
         productionDate: formattedDate,
@@ -372,13 +370,13 @@ const generateOverallLabel = async () => {
         String(now.getMonth() + 1).padStart(2, '0') +
         String(now.getDate()).padStart(2, '0')
 
-    const qrCodeData = `10#${formData.encodingPrint}$11#9DP$12#${formData.batch}$17#${formData.totalCount}$20#${formattedDate2}$31#${formData.orderNo}$DY`
+    const qrCodeData = `10#${formData.encoding}$11#9DP$12#${formData.batch}$17#${formData.totalCount}$20#${formattedDate2}$31#${formData.orderNo}$DY`
 
     const qrCodeImage = await generateQRCode(qrCodeData)
 
     Object.assign(labelData, {
       partName: formData.materialName || '',
-      partNumber: formData.encodingPrint || '',
+      partNumber: formData.encoding || '',
       totalCalculatedWeight: formData.totalCalculatedWeight || '',
       totalWeight: formData.totalWeight || '',
       productionDate: formattedDate,

src/views/weightManage/index.vue

@@ -295,7 +295,6 @@ const formData = reactive({
   inputMaterialCode2: '', // 输入的手动物料编码
   id: '', // 物料ID
   encoding: '', // 物料编码
-  encodingPrint: '', // 打印编码（国产替代）
   materialName: '', // 物料名称
   materialSpec: '', // 物料直径
   batch: '', // 批次
@@ -545,7 +544,6 @@ const workOrderResp = ref<WorkOrderResp>({
   orderNo: '',
   materialName: '',
   encoding: '',
-  encodingPrint: '',
   unitWeight: '',
   materialSpec: '',
   photoUrl: '',
@@ -563,8 +561,8 @@ const workOrderResp = ref<WorkOrderResp>({
 
 // 称重登记页面数据
 const inputQuantity = ref()
-// todo
 const calculateNumber = ref()
+// todo
 const ahDeviceWeight = ref('')
 const calculatedWeight = ref('')
 const weighingCount = ref(1)
@@ -608,7 +606,6 @@ const originalHandleMaterialCodeChange = async () => {
   // 无论是否有输入，先重置所有物料相关字段，确保新数据能完全覆盖旧数据
   formData.id = ''
   formData.encoding = ''
-  formData.encodingPrint = ''
   formData.materialName = ''
   formData.materialSpec = ''
   formData.unitWeight = 0
@@ -670,7 +667,6 @@ const fetchMaterialData = async (code: string) => {
   if (res.code === '0') {
     // 更新表单数据
     formData.id = res.data?.id || ''
-      formData.encodingPrint = res.data?.encodingPrint || ''
     formData.encoding = res.data?.encoding || ''
     formData.materialName = res.data?.materialName || ''
     formData.materialSpec = res.data?.materialSpec || ''
@@ -690,7 +686,6 @@ const handleMaterialCodeChange2 = async (code: string) => {
   if (!code || code?.trim()=== '') {
     formData.id = '';
     formData.encoding = '';
-    formData.encodingPrint = '';
     formData.materialName = '';
     formData.materialSpec = '';
     formData.batch = '';
@@ -705,7 +700,6 @@ const handleMaterialCodeChange2 = async (code: string) => {
   if (res.code === '0') {
     // 更新表单数据
     formData.id = res.data?.id || ''
-    formData.encodingPrint = res.data?.encodingPrint || ''
     formData.encoding = res.data?.encoding || ''
     formData.materialName = res.data?.materialName || ''
     formData.materialSpec = res.data?.materialSpec || ''
@@ -730,7 +724,6 @@ const handleNext = async () => {
       // 准备工作订单数据
       const workOrderData = {
         materialId: formData.id,
-        encodingPrint: formData.encodingPrint,
         workOrderInfos: weighingList.value,
       }
 
@@ -886,7 +879,6 @@ const handleConfirm = async () => {
     key: (weighingList.value.length + 1).toString(),
     weightTime: weighingCount.value,
     materialId: formData.id,
-    encodingPrint: formData.encodingPrint,
     quantity: inputQuantity.value,
     weight: ahDeviceWeight.value,
     mark: formData.mark,

src/views/workOrder/index.vue

@@ -174,7 +174,6 @@ const columns = ref<TableInstanceColumns[]>(processColumns([
   { title: '物料图片', dataIndex: 'photoUrl', slotName: 'photoUrl', minWidth: 180, ellipsis: true, tooltip: true },
   { title: '物料名称', dataIndex: 'materialName' },
   { title: '物料编码', dataIndex: 'encoding' },
-  { title: '打印编码（国产替代）', dataIndex: 'encodingPrint',width: 180 },
   { title: '单位克重', dataIndex: 'unitWeight' ,slotName: 'unitWeight'},
   { title: '总数量', dataIndex: 'totalCount' },
   { title: '标准总重量', dataIndex: 'totalCalculatedWeight' ,slotName: 'totalCalculatedWeight'},