Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-07-22 7f54cd99dfaf0cd391eaed930872460f85cd7a8e

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/components/sd/delivery/PrintSheet1.vue

@@ -8,6 +8,7 @@
const company = companyInfo()
let produceList = ref([])
let otherMoney = ref([])
let otherMoney1 = ref([])
let delivery = ref([])
let money = ref("")
let otherMoneys = 0
@@ -30,14 +31,34 @@

  request.post(`/Delivery/getSelectDeliveryPrinting`,form.value).then((res) => {
    if(res.code==200){
      console.log(res.data.data)
      produceList.value = deepClone(res.data.data)
      delivery.value=deepClone(res.data.delivery)
      money.value=deepClone(res.data.money)
      otherMoney.value=deepClone(res.data.otherMoney)
      console.log(otherMoney.value)
      otherMoney.value.forEach(item => {
        if(item.DeliveryDetailOtherMoney.monery!=null){
          otherMoneys+=item.DeliveryDetailOtherMoney.monery
          console.log(otherMoney1.value)
          if(otherMoney1.value.length===0){
            otherMoney1.value.push(item)
          }
          console.log(otherMoney1.value)
          otherMoney1.value.forEach(items=>{

              if(item.DeliveryDetailOtherMoney.alias===items.DeliveryDetailOtherMoney.alias){
                items.DeliveryDetailOtherMoney.count+=item.DeliveryDetailOtherMoney.count
                items.DeliveryDetailOtherMoney.monery +=item.DeliveryDetailOtherMoney.monery
                otherMoney1.value.push(items)
              }else{
                otherMoney1.value.push(item)
              }

            console.log(otherMoney1.value)


          })

        }

      })

 north-glass-erp/northglass-erp/src/views/pp/Replenish/PrintReplenishFlowCard.vue

@@ -312,6 +312,7 @@
    {field: 'patch_processes', title:  t('reportingWorks.responsibleProcess'),width:110},
    {field: 'product_name', title: t('order.product'),width:110},
    {field: 'glass_child', title: t('reportingWorks.glassChild'),width:110},
    {field: 'reporting_work_id', title: t('reportingWorks.reportingWorkId'),width:120},
  ],//表头按钮

  toolbarConfig: {

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

@@ -78,7 +78,11 @@
  style.innerHTML =
      "body>#" +
      printId +
      "{display:none}@media print{body>:not(#" +
      "{display:none}@media print{" +
      "@page {" +
      "    size: auto; " +
      "    margin: 12mm 4mm 2mm 6mm; " +
      "  }body>:not(#" +
      printId +
      "){display:none !important}body>#" +
      printId +
@@ -205,7 +209,7 @@
  }
  @page {
    size: auto;  /* auto is the initial value */
    margin: 12mm 4mm 2mm 6mm  /* this affects the margin in the printer settings */
    margin: 12mm 4mm 2mm 6mm;  /* this affects the margin in the printer settings */

  }
}

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

@@ -78,7 +78,11 @@
  style.innerHTML =
      "body>#" +
      printId +
      "{display:none}@media print{body>:not(#" +
      "{display:none}@media print{" +
      "@page {" +
      "    size: auto; " +
      "    margin: 2mm 2mm 2mm 2mm;  " +
      "  }body>:not(#" +
      printId +
      "){display:none !important}body>#" +
      printId +
@@ -102,7 +106,8 @@
<template>
  <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
  <div id="printFlowCard" >
    <div id="entirety" v-for="(item,id) in lastList" >
    <template v-for="(item,id) in lastList">
    <div id="entirety" >
      <div class="row1">
        <span>{{ item.customerAbbreviation }}</span>&nbsp;
        <span>{{ item.orderId }}</span>
@@ -118,6 +123,8 @@
        <span>{{ item.processingNote }}</span>
      </div>
    </div>
    <div style="width: 20px" v-if="id%2===0"></div>
    </template>
  </div>

</template>
@@ -137,20 +144,21 @@
  display: flex;
  justify-content: left;
  flex-wrap: wrap;
  width: 450px;
  width: 500px;
}

#entirety{
  text-align: center;
  width: 50%;
  height: 140px;
  width: 48%;
  height: 160px;
  border: black 1px;
  word-wrap: break-word;
}

.row1 {
  font-size: 12pt;
  font-weight: bold;
  height: 30px;
  height: 35px;
}
.row1 span {
  font-size: 14pt;
@@ -159,7 +167,7 @@
.row2 {
  font-size: 14pt;
  font-weight: bold;
  height: 30px;
  height: 35px;
}
.row2 span {
  font-size: 14pt;
@@ -171,16 +179,17 @@

.row3 {
  margin-top: -5px;
  height: 30px;
  height: 35px;
  font-size: 22pt;
  font-weight: bolder;
  line-height: 30px;
  line-height: 35px;
}

.row5 {
  height: 40px;
  height: 50px;
  font-weight: bold;
  font-size: 12pt;
  margin-left: 20px;
}
.row5 span {
  font-size: 14pt;

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

@@ -75,7 +75,11 @@
  style.innerHTML =
      "body>#" +
      printId +
      "{display:none}@media print{body>:not(#" +
      "{display:none}@media print{" +
      "@page {" +
      "    size: auto; " +
      "    margin: 2mm 2mm 2mm 2mm;  " +
      "  }body>:not(#" +
      printId +
      "){display:none !important}body>#" +
      printId +
@@ -99,7 +103,8 @@
<template>
  <el-button id="printButton" @click="printFlowCard();">{{ $t('basicData.print') }}</el-button>
  <div id="printFlowCard" >
    <div id="entirety" v-for="(item,id) in labelList" >
    <template v-for="(item,id) in labelList">
    <div id="entirety" >
      <div class="row1">
        <span>{{ item.customer_name }}</span>&nbsp;
        <span>{{ item.order_id }}</span>&nbsp;
@@ -113,13 +118,15 @@
        <span>{{ item.building_number }}</span>
        <span v-if="item.bend_radius!=null">R={{item.bend_radius}}</span>
      </div>
      <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)">{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</div>
      <div class="row3" v-else>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</div>
      <div class="row3" v-if="item.other_columns!=null&&(JSON.parse(item.other_columns).S02!=null)"> <span>{{JSON.parse(item.other_columns).S02}}={{item.quantity}}</span>&nbsp;</div>
      <div class="row3" v-else><span>{{Math.round(item.width)}}x{{Math.round(item.height)}}={{item.quantity}}</span></div>
      <div class="row5">
        <span>{{item.glass_child}}</span>&nbsp;
        <span>{{item.processing_note}}</span>
      </div>
    </div>
      <div style="width: 20px" v-if="id%2===0"></div>
    </template>
  </div>

</template>
@@ -139,14 +146,15 @@
  display: flex;
  justify-content: left;
  flex-wrap: wrap;
  width: 450px;
  width: 500px;
}

#entirety{
  text-align: center;
  width: 50%;
  height: 140px;
  width: 48%;
  height: 160px;
  border: black 1px;
  word-wrap: break-word;
}

.row1 {
@@ -160,7 +168,7 @@
.row2 {
  font-size: 12pt;
  font-weight: bold;
  height: 30px;
  height: 35px;
}
.row2 span {
  font-size: 14pt;
@@ -172,14 +180,17 @@

.row3 {
  margin-top: -5px;
  height: 30px;
  height: 35px;
  font-size: 22pt;
  font-weight: bolder;
  line-height: 30px;
  line-height: 35px;
}
.row3 span{
  font-size: 22pt;
}

.row5 {
  height: 40px;
  height: 50px;
  font-weight: bold;
  font-size: 14pt;
}
@@ -203,9 +214,10 @@
  }
  @page {
    size: auto;  /* auto is the initial value */
    margin: 2mm 2mm 2mm 2mm;  /* this affects the margin in the printer settings */
    margin: 13mm 4mm 0mm 4mm;  /* this affects the margin in the printer settings */

  }

}

</style>

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

@@ -82,7 +82,11 @@
    style.innerHTML =
        "body>#" +
        printId +
        "{display:none}@media print{body>:not(#" +
        "{display:none}@media print{" +
        "@page {" +
        "    size: auto; " +
        "    margin: 13mm 4mm 0mm 4mm; " +
        "  }body>:not(#" +
        printId +
        "){display:none !important}body>#" +
        printId +

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

@@ -77,7 +77,11 @@
  style.innerHTML =
      "body>#" +
      printId +
      "{display:none}@media print{body>:not(#" +
      "{display:none}@media print{" +
      "@page {" +
      "    size: auto; " +
      "    margin: 13mm 4mm 0mm 4mm; " +
      "  }body>:not(#" +
      printId +
      "){display:none !important}body>#" +
      printId +

 north-glass-erp/northglass-erp/src/views/pp/rework/PrintReworkFlowCard.vue

@@ -259,6 +259,7 @@
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      ,width:120
    },
    {
      field: 'process_id',
@@ -266,41 +267,46 @@
      showOverflow: "ellipsis",
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,
      width:130
    },
    {
      field: 'customer_name',
      title: t('customer.customerName'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,
      width:120
    },
    {
      field: 'project',
      title:  t('order.project'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,
      width:120
    },
    {
      field: 'order_number',
      title:  t('order.OrderNum'),
      filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged
      filterMethod: filterChanged,
      width:100
    },
    {field: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis"},
    {field: 'glass_address', title: t('processCard.glassAddress'),},
    {field: 'rework_num', title:  t('order.quantity'),},
    {field: 'rework_area', title:  t('order.area'),},
    {field: 'rework_team', title:  t('reportingWorks.responsibleTeam'),},
    {field: 'responsible_equipment', title:  t('reportingWorks.responsibleEquipment'),},
    {field: 'responsible_personnel', title:  t('reportingWorks.responsiblePersonnel'),},
    {field: 'rework_type', title:  t('reportingWorks.breakageType'),},
    {field: 'rework_reason', title:  t('reportingWorks.breakageReason'),},
    {field: 'rework_processes', title:  t('reportingWorks.responsibleProcess'),},
    {field: 'product_name', title: t('order.product'),},
    {field: 'glass_child', title: t('reportingWorks.glassChild'),},
    {field: 'technology_number', title: t('processCard.technologyNumber'), showOverflow: "ellipsis",width:90},
    {field: 'glass_address', title: t('processCard.glassAddress'),width:90},
    {field: 'rework_num', title:  t('order.quantity'),width:70},
    {field: 'rework_area', title:  t('order.area'),width:70},
    {field: 'rework_team', title:  t('reportingWorks.responsibleTeam'),width:90},
    {field: 'responsible_equipment', title:  t('reportingWorks.responsibleEquipment'),width:120},
    {field: 'responsible_personnel', title:  t('reportingWorks.responsiblePersonnel'),width:100},
    {field: 'rework_type', title:  t('reportingWorks.breakageType'),width:80},
    {field: 'rework_reason', title:  t('reportingWorks.breakageReason'),width:90},
    {field: 'rework_processes', title:  t('reportingWorks.responsibleProcess'),width:80},
    {field: 'product_name', title: t('order.product'),width:120},
    {field: 'glass_child', title: t('reportingWorks.glassChild'),width:120},
    {field: 'reporting_work_id', title: t('reportingWorks.reportingWorkId'),width:120},
  ],//表头按钮

  toolbarConfig: {

 north-glass-erp/northglass-erp/src/views/sd/order/CreateOrder.vue

@@ -860,7 +860,7 @@
          gridOptions.editRules[`otherColumns.${item.column}`] = [
            {
              validator ({ cellValue }) {
                const regex = /^(0|[1-9][0-9]{0,4}([.][0-9]{1,2})?)$/
                const regex = /^(0(\.\d{1,2})?|([1-9]\d{0,4})(\.\d{1,2})?|99999(\.9{1,2})?)$/
                if (cellValue && !regex.test(cellValue)) {
                  return new Error(t('basicData.msg.range99999Dec2'))
                }

 north-glass-erp/src/main/java/com/example/erp/entity/pp/FlowCard.java

@@ -64,6 +64,9 @@
    //修改时间
    private LocalDate updateTime;

    //报工编号
    private String reportingWorkId;

    //外键订单表
    @TableField(select = false,exist= false)
    private Order order;

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

@@ -122,19 +122,19 @@

    List<Map<String, String>> getPrimaryListMergeRefund(String processId, String technologyNumber, Integer orderNumber);

    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber);
    List<Map<String, Object>> getDetailListRefund(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);

    List<Map<String, String>> getPrimaryListRefund(String processId, String technologyNumber, Integer orderNumber);

    List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber);
    List<Map<String, Object>> getDetailListLikeRefund(String processId, String technologyNumber, Integer orderNumber, String reportingWorkId);

    List<Map<String, Object>> getPrimaryListRework(String processId, String technologyNumber, Integer orderNumber);

    List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber);
    List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);

    List<Map<String, Object>> getPrimaryListMergeRework(String processId, String printMerge, Integer orderNumber);

    List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber);
    List<Map<String, Object>> getDetailListLikeRework(String processId, String printMerge, Integer orderNumber, String reportingWorkId);

    List<Map<String, Object>> getPrintCustomDataSemi(String processId, Integer technologyNumber);
}

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

@@ -442,7 +442,7 @@
                //是否传入合并层数
                if (printMerge.equals("")||printMerge.equals("null") ){
                    itemmap.put("detail", flowCardMapper.getPrimaryListRefund(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getOrderNumber()));
                    List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber());
                    List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber(),flowCard.getReportingWorkId());
                    itemmap.put("detailList", detailList);
                }
                else {
@@ -451,13 +451,13 @@
                    if (printLike.equals("")||printLike.equals("null") ){
                        itemmap.put("detail", flowCardMapper.getPrimaryListMergeRefund(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber()));

                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber());
                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListRefund(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber(), flowCard.getReportingWorkId());
                        itemmap.put("detailList", detailList);
                    }
                    else {
                        itemmap.put("detail", flowCardMapper.getPrimaryListRefund(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getOrderNumber()));

                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeRefund(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber());
                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeRefund(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber(),flowCard.getReportingWorkId());
                        itemmap.put("detailList", detailList);
                    }
                }
@@ -494,7 +494,7 @@
                //是否传入合并层数
                if (printMerge.equals("")||printMerge.equals("null") ){
                    itemmap.put("detail", flowCardMapper.getPrimaryListRework(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getOrderNumber()));
                    List<Map<String, Object>> detailList = flowCardMapper.getDetailListRework(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber());
                    List<Map<String, Object>> detailList = flowCardMapper.getDetailListRework(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber(),flowCard.getReportingWorkId());
                    itemmap.put("detailList", detailList);
                }
                else {
@@ -503,13 +503,13 @@
                    if (printLike.equals("")||printLike.equals("null") ){
                        itemmap.put("detail", flowCardMapper.getPrimaryListMergeRework(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber()));

                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListRework(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber());
                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListRework(flowCard.getProcessId(), flowCard.getTechnologyNumber(),flowCard.getOrderNumber(), flowCard.getReportingWorkId());
                        itemmap.put("detailList", detailList);
                    }
                    else {
                        itemmap.put("detail", flowCardMapper.getPrimaryListRework(flowCard.getProcessId(), String.valueOf(flowCard.getTechnologyNumber()),flowCard.getOrderNumber()));

                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeRework(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber());
                        List<Map<String, Object>> detailList = flowCardMapper.getDetailListLikeRework(flowCard.getProcessId(), printMerge,flowCard.getOrderNumber(),flowCard.getReportingWorkId());
                        itemmap.put("detailList", detailList);
                    }
                }

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

@@ -781,7 +781,8 @@
               pl.patch_processes,
               od.product_name,
               ogd.glass_child,
               fc.print_status
               fc.print_status,
               pl.reporting_work_id
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
@@ -935,7 +936,8 @@
               pl.rework_reason,
               pl.rework_processes,
               od.product_name,
               ogd.glass_child
               ogd.glass_child,
               pl.reporting_work_id
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on ogd.order_id = fc.order_id and ogd.order_number = fc.order_number and
@@ -945,8 +947,8 @@
                 left join rework as pl on pl.order_id = fc.order_id and pl.process_id = fc.process_id and
                                           pl.order_sort = fc.order_number and
                                           pl.technology_number = fc.technology_number
        where pl.create_time between #{selectTime1} and #{selectTime2} and pl.review_status>0
        GROUP BY fc.process_id, ogd.technology_number
        where pl.create_time between #{selectTime1} and #{selectTime2}
        GROUP BY fc.process_id, ogd.technology_number,pl.reporting_work_id
        order by pl.id desc,fc.process_id, ogd.technology_number
    </select>

@@ -1037,6 +1039,7 @@
        where fc.process_id = #{processId}
          and fc.order_number = #{orderNumber}
          and position(fc.technology_number in #{technologyNumber})
        and pl.reporting_work_id=#{reportingWorkId}
        group by fc.process_id, fc.order_number,fc.technology_number
        order by IF(sort != NULL || sort != '', sort, fc.order_number)
    </select>
@@ -1104,6 +1107,7 @@
        where fc.process_id = #{processId}
          and fc.order_number = #{orderNumber}
          and position(fc.technology_number in #{technologyNumber})
          and pl.reporting_work_id=#{reportingWorkId}
        group by fc.process_id, fc.order_number,fc.technology_number
        order by IF(sort != NULL || sort != '', sort, fc.order_number)
    </select>
@@ -1171,6 +1175,7 @@
        where fc.process_id = #{processId}
          and fc.order_number = #{orderNumber}
          and position(fc.technology_number in #{technologyNumber})
          and pl.reporting_work_id=#{reportingWorkId}
        group by fc.process_id, fc.order_number,fc.technology_number
        order by IF(sort != NULL || sort != '', sort, fc.order_number)
    </select>
@@ -1237,6 +1242,7 @@
        where fc.process_id = #{processId}
          and fc.order_number = #{orderNumber}
          and position(fc.technology_number in #{technologyNumber})
          and pl.reporting_work_id=#{reportingWorkId}
        group by fc.process_id, fc.order_number,fc.technology_number
        order by IF(sort != NULL || sort != '', sort, fc.order_number)
    </select>