guoyuji
2024-09-20 cbfb94ee3bbda9cf341d326f55bec2b2f294e321
Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
4个文件已修改
28 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue 12 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/components/pp/PrintProcess.vue
@@ -212,7 +212,7 @@
          <div  style="font-weight: bolder;display: flex;justify-content:space-between">
            <div>打印人:{{user.user.userName}}</div>
            <div>
              {{itemFlow.otherRemarks}}&nbsp;&nbsp;
              <span style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
              流程卡号: {{
                itemFlow.process_id
              }}/{{ itemFlow.technologyNumber }} 共 {{ item.count }} 架
north-glass-erp/northglass-erp/src/components/pp/PrintProcessReplenish.vue
@@ -235,14 +235,10 @@
          <div id="bj" style="float: right;font-size: 28px">补 {{ id + 1 }}</div>
          <div>{{ company.companyName }}</div>
          <div>生产流程卡</div>
          <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">流程卡号: {{
              itemFlow.process_id
            }}/{{ itemFlow.technologyNumberMerge }} 共 {{ flowCardCount }} 架
          </div>
          <div  style="font-weight: bolder;display: flex;justify-content:space-between">
            <div>打印人:{{user.user.userName}}</div>
            <div>
              {{itemFlow.otherRemarks}}&nbsp;&nbsp;
              <span style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
              流程卡号: {{
                itemFlow.process_id
              }}/{{ itemFlow.technologyNumber }} 共 {{ item.count }} 架
@@ -360,11 +356,7 @@
      <tr v-for="(itemtextarea,index) in item.detail" :key="index">
        <td colspan="4" rowspan="5" style="width: 480px;height: 100px ">
          <div>
            次破类型:{{itemtextarea.breakage_type}}&nbsp;
            次破原因:{{itemtextarea.breakage_reason}}&nbsp;
            责任工序:{{itemtextarea.responsible_process}}&nbsp;
            责任班组:{{itemtextarea.responsible_team}}
            <span v-if="itemtextarea.responsible_personnel!=null">责任信息:{{itemtextarea.responsible_personnel}}</span>
          </div>
        </td>
north-glass-erp/northglass-erp/src/components/pp/PrintReworkProcess.vue
@@ -198,14 +198,10 @@
          <div id="bj" style="float: right;font-size: 28px">返 {{ id + 1 }}</div>
          <div>{{ company.companyName }}</div>
          <div>生产流程卡</div>
          <div v-if="itemFlow.technologyNumberMerge!=''" style="text-align: right;font-weight: bolder">流程卡号: {{
              itemFlow.process_id
            }}/{{ itemFlow.technologyNumberMerge }} 共 {{ flowCardCount }} 架
          </div>
          <div  style="font-weight: bolder;display: flex;justify-content:space-between">
            <div>打印人:{{user.user.userName}}</div>
            <div>
              {{itemFlow.otherRemarks}}&nbsp;&nbsp;
              <span style="font-size: 10px">{{itemFlow.otherRemarks}}</span>&nbsp;&nbsp;
              流程卡号: {{
                itemFlow.process_id
              }}/{{ itemFlow.technologyNumber }} 共 {{ item.count }} 架
@@ -323,11 +319,7 @@
      <tr v-for="(itemtextarea,index) in item.detail" :key="index">
        <td colspan="4" rowspan="5" style="width: 480px;height: 100px ">
          <div>
            次破类型:{{itemtextarea.breakage_type}}&nbsp;
            次破原因:{{itemtextarea.breakage_reason}}&nbsp;
            责任工序:{{itemtextarea.responsible_process}}&nbsp;
            责任班组:{{itemtextarea.responsible_team}}
            <span v-if="itemtextarea.responsible_personnel!=null">责任信息:{{itemtextarea.responsible_personnel}}</span>
          </div>
        </td>
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -471,7 +471,7 @@
        where create_time between #{selectTime1} and #{selectTime2}
          and position(#{orderId} in order_id)
          and position(#{project} in project)
          and processing_card = 2
          and processing_card >0
        order by create_time desc
    </select>