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

chenlu

2024-07-18 b864a88a6d34cbed2cfaad7f5e843ea1330c9c91

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

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

@@ -108,11 +108,11 @@
      </tr>

      <tr  class="title-s">
        <th colspan="2"></th>
        <th colspan="5">
        <th colspan="2" style="width: 30%"></th>
        <th colspan="5" style="width: 40%;">
          <h3>销售发货单</h3>
        </th>
        <th colspan="2" style="text-align: left;">发货单号：<span>{{delivery.deliveryId}}</span></th>
        <th colspan="2" style="width: 30%;text-align: left;">发货单号：<span>{{delivery.deliveryId}}</span></th>
      </tr>
      <tr>
        <th style="text-align: left;border:none;" colspan="4">客户名称：<span>{{delivery.customerName}}</span></th>
@@ -462,7 +462,7 @@
}
@page {
  size: auto;
  margin: 8mm 16mm 16mm 16mm
  margin: 8mm 16mm 20mm 16mm;

}


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

@@ -107,11 +107,11 @@
      </tr>

      <tr  class="title-s">
        <th colspan="2"></th>
        <th colspan="5">
        <th colspan="2" style="width: 30%"></th>
        <th colspan="5" style="width: 40%;">
          <h3>销售发货单</h3>
        </th>
        <th colspan="2" style="text-align: left;">发货单号：<span>{{delivery.deliveryId}}</span></th>
        <th colspan="2" style="width: 30%;text-align: left;">发货单号：<span>{{delivery.deliveryId}}</span></th>
      </tr>
      <tr>
        <th style="text-align: left;border:none;" colspan="4">客户名称：<span>{{delivery.customerName}}</span></th>
@@ -238,6 +238,7 @@
}
h3{
  font-size: 1.2rem;
  font-weight: bolder;
}


@@ -278,7 +279,7 @@
}
@page {
  size: auto;
  margin: 8mm 16mm 16mm 16mm
  margin: 8mm 16mm 20mm 16mm;

}


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

@@ -137,7 +137,7 @@
  display: flex;
  justify-content: left;
  flex-wrap: wrap;
  width: 400px;
  width: 450px;
}

#entirety{
@@ -152,11 +152,17 @@
  font-weight: bold;
  height: 25px;
}
.row1 span {
  font-size: 12pt;
}

.row2 {
  font-size: 12pt;
  font-weight: bold;
  height: 25px;
}
.row2 span {
  font-size: 12pt;
}
span {
  font-size: 12pt;
@@ -175,14 +181,8 @@
  font-weight: bold;
  font-size: 12pt;
}
.row1 span {
  font-size: 10pt;
}
.row2 span {
  font-size: 10pt;
}
.row5 span {
  font-size: 10pt;
  font-size: 12pt;
}

.row6 {
@@ -195,7 +195,7 @@

@page {
  size: auto;  /* auto is the initial value */
  margin: 2mm 2mm 2mm 2mm  /* this affects the margin in the printer settings */
  margin: 2mm 2mm 2mm 2mm;  /* this affects the margin in the printer settings */

}


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

@@ -140,7 +140,7 @@
  display: flex;
  justify-content: left;
  flex-wrap: wrap;
  width: 400px;
  width: 450px;
}

#entirety{
@@ -155,11 +155,16 @@
  font-weight: bold;
  height: 35px;
}

.row1 span {
  font-size: 12pt;
}
.row2 {
  font-size: 12pt;
  font-weight: bold;
  height: 25px;
}
.row2 span {
  font-size: 12pt;
}
span {
  font-size: 12pt;
@@ -179,12 +184,6 @@
  font-weight: bold;
  font-size: 12pt;
}
.row1 span {
  font-size: 12pt;
}
.row2 span {
  font-size: 12pt;
}
.row5 span {
  font-size: 12pt;
}
@@ -199,7 +198,7 @@

@page {
  size: auto;  /* auto is the initial value */
  margin: 2mm 2mm 2mm 2mm  /* this affects the margin in the printer settings */
  margin: 2mm 2mm 2mm 2mm;  /* this affects the margin in the printer settings */

}


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

@@ -182,6 +182,10 @@
  font-weight: bold;
  height: 20px;
}
.row1 span {
  font-size: 8pt;
  font-weight: bold;
}

.row2 {
  font-size: 8pt;
@@ -193,20 +197,11 @@
  font-weight: bold;
}

.row1 span {
  font-size: 8pt;
  font-weight: bold;
}

.row6 span {
  font-size: 10pt;
  font-weight: bold;
}

.row5 span {
  font-size: 10pt;
  font-weight: bold;
}





.row3 {
@@ -221,18 +216,26 @@
  font-weight: bold;
  font-size: 8pt;
}
.row5 span {
  font-size: 10pt;
  font-weight: bold;
}

.row6 {
  height: 20px;
  font-weight: bold;
  font-size: 8pt;
}
.row6 span {
  font-size: 10pt;
  font-weight: bold;
}



@page {
  size: auto;  /* auto is the initial value */
  margin: 13mm 4mm 0mm 4mm  /* this affects the margin in the printer settings */
  margin: 13mm 4mm 0mm 4mm;  /* this affects the margin in the printer settings */

}


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

@@ -152,11 +152,17 @@
  font-weight: bold;
  height: 20px;
}
.row1 span {
  font-size: 10pt;
}

.row2 {
  font-size: 8pt;
  font-weight: bold;
  height: 20px;
}
.row2 span {
  font-size: 10pt;
}
span {
  font-size: 10pt;
@@ -179,19 +185,15 @@
.row5 span {
  font-size: 8pt;
}
.row1 span {
  font-size: 10pt;
}
.row2 span {
  font-size: 10pt;
}






@page {
  size: auto;  /* auto is the initial value */
  margin: 13mm 4mm 0mm 4mm  /* this affects the margin in the printer settings */
  margin: 13mm 4mm 0mm 4mm;  /* this affects the margin in the printer settings */

}


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

@@ -25,7 +25,7 @@

    Boolean updateDamageDetails(@Param("patchLog") PatchLog patchLog);

    Boolean updateReportingWorkDetail(@Param("patchLog") PatchLog patchLog);
    Boolean updateReportingWorkDetail(@Param("reportingWorkId") String reportingWorkId,@Param("orderSort") Integer orderSort,@Param("technologyNumber") Integer technologyNumber);

    Boolean updateReplenish(@Param("patchLog") PatchLog patchLog ,  @Param("userName") String userName);


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

@@ -94,7 +94,7 @@
                    //添加返工记录，修改次破明细数量
                    patchMapper.insertReplenish(patchLog,oddNumber);
                    patchMapper.updateDamageDetails(patchLog);
                    patchMapper.updateReportingWorkDetail(patchLog);
                    patchMapper.updateReportingWorkDetail(patchLog.getReportingWorkId(), Integer.valueOf(patchLog.getOrderSort()),patchLog.getTechnologyNumber());
                }
            }


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

@@ -25,6 +25,8 @@
@Transactional(rollbackFor = Exception.class)
public class ReworkService {
    @Autowired
    PatchLogMapper patchMapper;
    @Autowired
    ReworkMapper reworkMapper;
    @Autowired
    BasicDateProduceMapper basicDateProduceMapper;
@@ -107,6 +109,7 @@
                    //添加返工记录，修改次破明细数量
                    reworkMapper.insertRework(rework,oddNumber);
                    reworkMapper.updateDamageDetails(rework);
                    patchMapper.updateReportingWorkDetail(rework.getReportingWorkId(), Integer.valueOf(rework.getOrderSort()),rework.getTechnologyNumber());
                }
            }


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

@@ -111,8 +111,8 @@
    </update>

    <update id="updateReportingWorkDetail"  >
        update pp.reporting_work_detail set patch_status=1 where reporting_work_id=#{patchLog.reportingWorkId}
                                          and order_number=#{patchLog.orderSort} and technology_number=#{patchLog.technologyNumber}
        update pp.reporting_work_detail set patch_status=1 where reporting_work_id=#{reportingWorkId}
                                          and order_number=#{orderSort} and technology_number=#{technologyNumber}
    </update>



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

@@ -591,7 +591,12 @@
    </select>
<!--    查询下工序是否报工-->
    <select id="selectCountByProcessId">
        select count(reporting_work_id) from reporting_work where this_process=#{nextProcess} and process_id=#{processId}
        select count(reporting_work_id)
        from reporting_work
        where
            this_process=#{nextProcess}
            and process_id=#{processId}
            and reviewed_state>-1
    </select>

<!--    查询完工次破数量-->
@@ -600,12 +605,10 @@
               rwd.order_number,
               rwd.technology_number,
               rwd.completed_quantity,
               IFNULL(SUM(dd.breakage_quantity), 0) as breakage_quantity
               rwd.breakage_quantity as breakage_quantity
        from reporting_work as rw
                 left join reporting_work_detail as rwd on rw.reporting_work_id = rwd.reporting_work_id
                 left join damage_details as dd
                           on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number = rwd.order_number and
                              dd.technology_number = rwd.technology_number

        where rw.reporting_work_id = #{reportingWorkId}
        GROUP BY rwd.order_number, rwd.technology_number
    </select>