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

guoyuji

2024-11-05 3cbcba777b238256dbb44dc523111a1b807b03dd

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

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

@@ -68,6 +68,7 @@
            }
          }
        }
        console.log(props.lastList)
      } else {
        ElMessage.warning(res.msg)
      }
@@ -126,6 +127,12 @@
    if (propertyName === 'glassNumber' && glassNumber === obj.glassNumber){
      obj.glassNumber = result;
    }
    if (propertyName === 'width' && glassNumber === obj.glassNumber){
      obj.width = result;
    }
    if (propertyName === 'height' && glassNumber === obj.glassNumber){
      obj.height = result;
    }
    if (propertyName === 'custom1' && orderId === obj.orderId){
      obj.custom1 = result;
    }

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

@@ -204,7 +204,7 @@
    <table v-for="(item,id) in produceList" id="contentTable" :key="id" style="border-bottom: none">
      <thead>
      <tr v-for="(itemFlow,index) in item.detail" :key="index">
        <td  colspan="29">
        <td  colspan="31">
          <div style="float: left;"><input style="border: none;font-size: 28px;width: 70px;margin: 5px  "/></div>
          <div id="bj" style="float: right;font-size: 28px">{{ id + 1 }}</div>
          <div>{{ company.companyName }}</div>
@@ -226,7 +226,7 @@
        <td class="tdNowrap">项目名称：</td>
        <td colspan="4">{{ items.project }}</td>
        <td class="tdNowrap">工艺流程：</td>
        <td colspan="20"  style="width: 500px">{{ items.process }}</td>
        <td colspan="22"  style="width: 500px">{{ items.process }}</td>
      </tr>
      <tr v-for="(itemTr,index) in item.detail" :key="index">
        <td class="tdNowrap">磨边类型：</td>
@@ -234,17 +234,18 @@
        <td class="tdNowrap">单片名称：</td>
        <td colspan="4">{{ itemTr.glass_child }}</td>
        <td class="tdNowrap">产品名称：</td>
        <td colspan="20">{{ itemTr.product_name }}</td>
        <td colspan="22">{{ itemTr.product_name }}</td>
      </tr>
      <tr>
        <td rowspan='2'>序号</td>
        <td rowspan='2'>图号</td>
        <td rowspan='2'>编号</td>
        <td rowspan="2">小片顺序</td>
        <td rowspan='2' style="width: 90px">宽*高</td>
        <td rowspan='2'>数量</td>
        <td rowspan='2'>面积</td>
        <td rowspan='2'>周长</td>
        <td rowspan='2'>半径</td>
        <td rowspan='2'>半径/备注</td>
        <td rowspan='2'>备注</td>
        <td v-for="(itemPr,index) in item.processList" :key="index" colspan="2">{{ itemPr.process }}</td>
      </tr>
@@ -276,6 +277,7 @@

      <tr v-for="(itemDatile,index) in item.detailList" :key="index">
        <td>{{ itemDatile.order_number }}</td>
        <td>{{ itemDatile.mapNumber }}</td>
        <td>{{ itemDatile.s01Value }}</td>
        <td>{{ itemDatile.technology_number }}</td>
        <td>{{ itemDatile.child_width }}</td>
@@ -308,7 +310,7 @@
        <td></td>
      </tr>
      <tr style="height: 14px">
        <td v-for="(itemsum,index) in item.detail" :key="index" colspan="29">
        <td v-for="(itemsum,index) in item.detail" :key="index" colspan="31">
          数量：
          <label>{{ itemsum.quantity }}</label>
          面积：
@@ -320,6 +322,7 @@
      <tr v-for="(itemtextarea,index) in item.detail" :key="index">

        <td>完工签名</td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
@@ -351,14 +354,15 @@
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
        <td colspan="2"></td>
      </tr>

      <tr>
        <td>原片箱号</td>
        <td colspan="28"></td>
        <td colspan="31"></td>
      </tr>
      <tr v-for="(qrCodeItem,index) in item.detail" :key="index">
        <td colspan="29">
        <td colspan="31">
          <span style="display: flex;">
            <span v-for="(qrCodeItems,index) in qrCodeItem.qrcodeList" :key="index" style="display: flex;width: 35%">
            <div class='qrCode' style="width: 80px;height: 80px;">
@@ -373,7 +377,7 @@

      </tr>
      <tr v-if="company.remarkSwitch=='1'">
        <td colspan="29">
        <td colspan="31">
          <div style="display: flex;flex-wrap: wrap;">
            <div class="nuber_xx" v-for="(itemremark,index) in item.remarkList" :key="index">
             <span v-if="!(itemremark.S02==null&&itemremark.S03==null&&itemremark.S04==null&&itemremark.S05==null)">
@@ -391,13 +395,13 @@
      <tfoot>

      <tr v-for="(itemtextareas,index) in item.detail" :key="index">
        <td  colspan="29"  style="width: 480px;height: 150px ">
        <td  colspan="31"  style="width: 480px;height: 150px ">
          <div style="width: 100%;height: 100%;text-align: left"><textarea style="height: 99%;width: 99%;border: none;;font-size: 12px;overflow: hidden;text-align: left;vertical-align: middle">{{itemtextareas.processing_note}}</textarea>
          </div>
        </td>
      </tr>
      <tr style="border-bottom: none">
        <td colspan="29" style="text-align: left;border-bottom: none;">
        <td colspan="31" style="text-align: left;border-bottom: none;">
          <div>
            <span>质检签名：</span>
            <span style="margin-left: 300px">生产签名：</span>

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

@@ -434,7 +434,7 @@
    }
  })
  if(trademarkAttr.value.trademark===company.icon){
    trademarkAttr.value.yMargin=66
    trademarkAttr.value.xMargin=66
  }

}

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

@@ -26,7 +26,7 @@
    //序号
    private Integer orderNumber;
    //工艺确认序号
    private Integer technologyNumber;
    private String technologyNumber;
    //分架数量
    private Integer quantity;
    //已优化数量

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

@@ -75,9 +75,9 @@

    List<Map<String, String>> getPrimaryList(String processId, String technologyNumber, String glassChild, String process);

    List<Map<String, Object>> getDetailList(String processId, Integer technologyNumber, String process);
    List<Map<String, Object>> getDetailList(String processId, String technologyNumber, String process);

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

    Boolean updateInventory(String processId, String orderNumber, String technologyNumber, Integer completedQuantity);

@@ -87,13 +87,13 @@

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

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

    List<Map<String, String>> getPrintLabelDetail(@Param("flowCard") FlowCard flowCard);

    List<Map<String, String>> printFlowCardDetailsMp(String processId, String technologyNumber, String process, FlowCard flowCard);

    Boolean printSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);
    Boolean printSortMp(String processId, Integer orderNumber, String technologyNumber, Integer sort);

    List<Map<String,String>> selectType();

@@ -101,21 +101,21 @@

    List<Map<String, Object>> getCustomLabelDetailMp(String name, String form, String id, FlowCard flowCard);

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

    Integer getPrintLabelCount(String processId, Integer technologyNumber);
    Integer getPrintLabelCount(String processId, String technologyNumber);

    List<Map<String, String>> selectReplenishPrintMp(Date selectTime1, Date selectTime2, FlowCard flowCard);

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

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

    Boolean updatePrintStateMp(Integer printState, String processId, Integer technologyNumber);
    Boolean updatePrintStateMp(Integer printState, String processId, String technologyNumber);

    List<Map<String, String>> printFlowCardOrderSortMp(String orderId, FlowCard flowCard);

    Boolean printOrderSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort);
    Boolean printOrderSortMp(String processId, Integer orderNumber, String technologyNumber, Integer sort);

    List<Map<String, String>> getPrimaryListMerge(String processId, String technologyNumber);

@@ -127,7 +127,7 @@

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

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

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

@@ -135,27 +135,27 @@

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

    List<Map<String, Object>> getDetailListRework(String processId, Integer technologyNumber, Integer orderNumber, String reportingWorkId);
    List<Map<String, Object>> getDetailListRework(String processId, String 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, String reportingWorkId);

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

    List<Map<String, String>> selectPrintNotMp(String orderId);

    List<Map<String, String>> selectPrintNotMergeMp(String orderId);

    List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, Integer technologyNumber, String reportingWorkId);
    List<Map<String, String>> getRepairPrintCustomDataSemi(String processId, String technologyNumber, String reportingWorkId);

    List<Map<String, String>> selectPrintAllMp(String orderId);

    Boolean printAddSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);
    Boolean printAddSortMp(String processId, Integer orderNumber, String technologyNumber, Integer sort, String process);

    Integer printAddSortCountMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);
    Integer printAddSortCountMp(String processId, Integer orderNumber, String technologyNumber, Integer sort, String process);

    Boolean printUpdateSortMp(String processId, Integer orderNumber, Integer technologyNumber, Integer sort, String process);
    Boolean printUpdateSortMp(String processId, Integer orderNumber, String technologyNumber, Integer sort, String process);

    List<Map<String, String>> getPrimaryListLimt(String processId, String technologyNumber, String glassChild, String process);


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

@@ -75,7 +75,7 @@

    List<Map<String,String>> detailsQualityMp(String reportingWorkId, ReportingWork reportingWork);

    Integer selectLayerByReportingWorkId(String reportingWorkId);
    String selectLayerByReportingWorkId(String reportingWorkId);

    Boolean ReviewReportingWorkMp(String substring, String process, String result, String userName);


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

@@ -131,7 +131,7 @@
            //查询本工序报工需要哪几层，上工序是什么
            String obtainTechnology = reportingWorkMapper.SelectWorkTechnologyMp(processIdStr);

            map.put("numberList", flowCardMapper.getGlassNumber(Integer.valueOf(technologyStr),processIdStr));
            map.put("numberList", flowCardMapper.getGlassNumber(technologyStr,processIdStr));

            //判断本工序是不是第一道工序
            if (interceptProcess.equals(process)) {

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

@@ -666,7 +666,8 @@
               round(ogd.child_width)                                         as width,
               round(ogd.child_height)                                        as height,
               pd.separation,
               fc.technology_number
               fc.technology_number,
               IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and
@@ -1215,7 +1216,8 @@
               round(ogd.child_width)                                         as width,
               round(ogd.child_height)                                        as height,
               pd.separation,
               fc.technology_number
               fc.technology_number,
               IFNULL(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S02')),'') as mapNumber
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
                           on fc.order_id = ogd.order_id and fc.order_number = ogd.order_number and

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

@@ -430,11 +430,11 @@
                ifnull(g.completed_quantity,0) as nextQuantitySum,  -- 后工序已完成
                if((f.completed_quantity
                    -ifnull(g.completed_quantity,0))
                    &gt;=
                    >
                   a.completed_quantity,
                    0,
                   (a.completed_quantity-f.completed_quantity
                       +ifnull(g.completed_quantity,0))
                   (f.completed_quantity
                       -ifnull(g.completed_quantity,0))
                    )  as minQuantity -- 修改最小数
            </if>
            <if test="nextProcess == null or nextProcess == ''">  -- 最后一道工序