Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

guoyuji

2025-02-19 3d66a05e01b17a57f80a422b19fbbff92a69c080

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

 north-glass-erp/northglass-erp/src/components/pp/SelectProcessCardDetail.vue

@@ -145,7 +145,7 @@
    buttons: [
      {code: 'update', name: t('合架'), status: 'primary'},
      {code: 'save', name: t('保存'), status: 'primary'},
      {code: 'clear', name: t('删除'), status: 'primary'},
      {code: 'clear', name: t('清空'), status: 'primary'},
    ],

  },

 north-glass-erp/northglass-erp/src/components/sd/order/PrintSheet4.vue

@@ -36,6 +36,7 @@
})
const getData = () => {
  request.get(`/order/printOrderProductDetail/${props.orderId}/${selectedValues.value}`).then(res => {
    console.log(res.data)
    data.value= res.data
    productIdData.value=data.value.orderProductDetail
    data.value.orderProductDetail.forEach(item => {
@@ -188,7 +189,7 @@
                <td>{{items.orderNumber}}</td>
                <td>{{items.buildingNumber}}</td>
                <td colspan="3" style="font-size: 20px;font-weight: bold;" v-if="items.otherColumns?.S02">{{items.otherColumns?.S02}}</td>
                <td colspan="3" style="font-size: 20px;font-weight: bold;" v-else-if="items.differentSize==1">
                <td colspan="3" style="font-size: 20px;font-weight: bold;" v-else-if="items.differentSize===1 && items.bendRadius==null">
                  <template v-for="(orderGlassDetail, index1) in items.orderGlassDetails" >
                  ({{orderGlassDetail.childWidth}}x{{orderGlassDetail.childHeight}})
                  </template>

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintLabel.vue

@@ -122,7 +122,7 @@
        "{display:none}@media print{" +
        "@page {" +
        "    size: auto; " +
        "    margin: 13mm 4mm 0mm 4mm; " +
        "    margin: 13mm 4mm 2mm 4mm; " +
        "  }body>:not(#" +
        printId +
        "){display:none !important}body>#" +
@@ -197,7 +197,7 @@
      </div>
      <div class="row6">
        <span>{{item.glass_child}}</span>&nbsp;
        <span v-if="company.showDeliveryCreator" style="font-size: 6pt" >{{item.processing_note}}</span>
        <span v-if="company.showDeliveryCreator" style="font-size: 10pt" >{{item.processing_note}}</span>
        <span v-else style="font-size: 6pt">{{item.processing_note}}</span>
      </div>
    </div>

 north-glass-erp/northglass-erp/src/views/sd/delivery/SelectDelivery.vue

@@ -214,9 +214,20 @@
              ElMessage.warning(t('order.orderNotApproved'))
            }
          }else{
            flowData.value.delivery=selectRecords
            dialogTableVisible.value = true
            sheetIndex.value=1
            let a=0
            selectRecords.forEach((item) => {
              if(item.deliveryState==0){
                ElMessage.warning(t('order.orderNotApproved'))
                a=1
              }
            })
            if(a==0){
              flowData.value.delivery=selectRecords
              dialogTableVisible.value = true
              sheetIndex.value=1
            }


          }

          break
@@ -236,9 +247,19 @@
              ElMessage.warning(t('order.orderNotApproved'))
            }
          }else{
            flowData.value.delivery=selectRecords
            dialogTableVisible.value = true
            sheetIndex.value=2
            let a=0
            selectRecords.forEach((item) => {
              if(item.deliveryState==0){
                ElMessage.warning(t('order.orderNotApproved'))
                a=1
              }
            })
            if(a==0){
              flowData.value.delivery=selectRecords
              dialogTableVisible.value = true
              sheetIndex.value=2
            }

          }
          break
        }

 north-glass-erp/src/main/java/com/example/erp/mapper/pp/FlowCardMapper.java

@@ -91,7 +91,7 @@

    Boolean updateComposing(String processId);

    Boolean updateProcessCardRack(String processId,String technologyNumber,Integer orderNumber,String rack);
    Boolean updateProcessCardRack(String processId,String technologyNumber,String rack);

    List<Map<String, String>> getPrintLabel(String projectNo);


 north-glass-erp/src/main/java/com/example/erp/service/pp/FlowCardService.java

@@ -489,7 +489,7 @@
        List<FlowCard> flowCardList = JSONArray.parseArray(JSONObject.toJSONString(object.get("composing")), FlowCard.class);
        if (!flowCardList.isEmpty()) {
            for (FlowCard flowCard : flowCardList) {
                flowCardMapper.updateProcessCardRack(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getOrderNumber(),flowCard.getRack());
                flowCardMapper.updateProcessCardRack(flowCard.getProcessId(),flowCard.getTechnologyNumber(),flowCard.getRack());
            }
            return true;
        }

 north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml

@@ -831,7 +831,7 @@
    <update id="updateProcessCardRack">
        update flow_card as fc
        set fc.rack=#{rack}
        where fc.process_id = #{processId} and fc.technology_number=#{technologyNumber} and order_number=#{orderNumber}
        where fc.process_id = #{processId} and fc.technology_number=#{technologyNumber}
    </update>

    <select id="getPrintLabel">