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

guoyuji

2024-07-18 09897d2adec822b398c652bc3b8e6b6cfd6a6b2b

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/lang/zh.js

@@ -394,7 +394,7 @@
        productType:'产品类型',
        whetherToScheduleProduction:'是否排产',
        deleteNo:'删除失败，检查流程卡是否已报工',
        deleteNoProcedure:'删除失败，检查下工序是否已报工',
        deleteNoProcedure:'删除失败，请检查下工序是否已报工或者已补片返工',
        pleaseCheckTheRequiredData:'请勾选需要的数据',
        landingSequence:'落架顺序',


 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/ReportingWorkService.java

@@ -451,27 +451,47 @@
            Integer count = reportingWorkMapper.selectCountByProcessId(processId, nextProcess);
            //获取最后一道工序
            String lastProcess = reportingWorkMapper.selectLastProcess(processId);
            //判断是否是入库工序
            if (lastProcess.equals(thisProcess)) {//是入库工序
                //查询该流程卡数量、可入库数量、已入库数量
                Map<String, Object> list = reportingWorkMapper.selectReceiptQuantity(processId);
                if (list.get("quantity") == list.get("receiptQuantity")) {
                    return false;
                } else {
                    //转换类型:已入库数量
                    Integer receiptQuantity = Integer.parseInt(list.get("receivedQuantity").toString());
                    //转换类型:可入库数量
                    Integer inventoryQuantity = Integer.parseInt(list.get("inventoryQuantity").toString());
                    //查询该报工编号本工序完工数量
                    Integer completedQuantity = reportingWorkMapper.selectCompletedQuantity(reportingWorkId);
                    //当该工序完工数量小于等于已入库数量时
                    //可入库数量-已入库数量>=报工编号本工序完工数量
                    if (inventoryQuantity - receiptQuantity >= completedQuantity) {
            //获取是否有已补片或返工
            Integer countStates= Integer.valueOf(reportingWorkMapper.getPatchConditionMp(reportingWorkId));
            //判断是否有补片返工数据
            if (countStates==0){
                //判断是否是入库工序
                if (lastProcess.equals(thisProcess)) {//是入库工序
                    //查询该流程卡数量、可入库数量、已入库数量
                    Map<String, Object> list = reportingWorkMapper.selectReceiptQuantity(processId);
                    if (list.get("quantity") == list.get("receiptQuantity")) {
                        return false;
                    } else {
                        //转换类型:已入库数量
                        Integer receiptQuantity = Integer.parseInt(list.get("receivedQuantity").toString());
                        //转换类型:可入库数量
                        Integer inventoryQuantity = Integer.parseInt(list.get("inventoryQuantity").toString());
                        //查询该报工编号本工序完工数量
                        Integer completedQuantity = reportingWorkMapper.selectCompletedQuantity(reportingWorkId);
                        //当该工序完工数量小于等于已入库数量时
                        //可入库数量-已入库数量>=报工编号本工序完工数量
                        if (inventoryQuantity - receiptQuantity >= completedQuantity) {
                            //查询当前报工编号完工次破数量的数据
                            List<Map<String, Object>> workDateList = reportingWorkMapper.reportingWorkDate(reportingWorkId);
                            for (Map<String, Object> item : workDateList) {
                                //更新流程卡可入库数量
                                reportingWorkMapper.updateInventoryQuantity(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"));
                                //更新报工流程表数据
                                reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
                            }
                            //删除报工，将审核状态改为-1
                            reportingWorkMapper.deleteWork(reportingWorkId);
                            return true;
                        } else {
                            return false;
                        }
                    }

                } else {//不是入库工序
                    if (count == 0) {
                        //查询当前报工编号完工次破数量的数据
                        List<Map<String, Object>> workDateList = reportingWorkMapper.reportingWorkDate(reportingWorkId);
                        for (Map<String, Object> item : workDateList) {
                            //更新流程卡可入库数量
                            reportingWorkMapper.updateInventoryQuantity(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"));
                            //更新报工流程表数据
                            reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
                        }
@@ -482,23 +502,10 @@
                        return false;
                    }
                }

            } else {//不是入库工序
                if (count == 0) {
                    //查询当前报工编号完工次破数量的数据
                    List<Map<String, Object>> workDateList = reportingWorkMapper.reportingWorkDate(reportingWorkId);
                    for (Map<String, Object> item : workDateList) {
                        //更新报工流程表数据
                        reportingWorkMapper.updateWorkProcess(processId, item.get("order_number"), item.get("technology_number"), item.get("completed_quantity"), item.get("breakage_quantity"), thisProcess);
                    }
                    //删除报工，将审核状态改为-1
                    reportingWorkMapper.deleteWork(reportingWorkId);
                    return true;
                } else {
                    return false;
                }
            }

            else {
                return false;
            }

        } else {
            return false;

 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

@@ -287,7 +287,7 @@
                right join (
                select distinct process,teams from
                    (   select distinct rw.this_process as  process,rw.teams_groups_name as teams
                        from reporting_work as rw where rw.process_id=#{processIdStr}
                        from reporting_work as rw where rw.process_id=#{processIdStr} and rw.reviewed_state>=0

                    ) as t
            ) as  rw