chenlu
3 天以前 d5055b7870d0406f9b00d429cb47d2bfb79b902c
补片流程卡添加打印次数
6个文件已修改
48 ■■■■ 已修改文件
north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/pp/replenish/PrintReplenishFlowCard.vue
@@ -367,6 +367,11 @@
    {field: 'glass_child', title: t('reportingWorks.glassChild'),width:110,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
    {field: 'reporting_work_id', title: t('reportingWorks.reportingWorkId'),width:120,filters: [{data: ''}],slots: {filter: 'num1_filter'}, filterMethod: filterChanged},
    {field: 'create_time', title: t('basicData.reportData'),width:120},
    {
      field: 'print_num',
      title: t('processCard.printStatus'),
       width: 120
    },
  ],//表头按钮
  toolbarConfig: {
@@ -712,10 +717,9 @@
// 监听打印完成事件
const printNumber = () =>{
  selectRecordsData.value.printList=selectRecords
  let printState=0
  request.post(`/processCard/updatePrintState/${printState}`, selectRecordsData.value).then((res) => {
  const $grid = xGrid.value
  selectRecords = $grid.getCheckboxRecords()
  request.post(`/Replenish/updatePrintNum`, selectRecords).then((res) => {
    if (res.code == 200 && res.data === true) {
    } else {
@@ -848,7 +852,7 @@
        destroy-on-close
        style="width: 75%;height:75% ">
      <template #header="{ close, titleId, titleClass }">
        <el-button v-print="printContent"   :icon="Printer" circle />
        <el-button v-print="printContent"   :icon="Printer" circle @click="printNumber"/>
      </template>
      <print-process id="child" :printList="printRow.list" :printMerge="printRow.printMergeVal" :printLike="printRow.like"
                     :mergeTechnologyNumber="printRow.mergeTechnologyNumber"
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
@@ -108,4 +108,13 @@
        //参数:相应的数据,实体类信息,相应的方法(数据获取),生成的excel名字
        DownExcel.download(response, exportReplenishDTO.class, replenishService.exportReplenishSv(dates), "PatchLogAddDTO");
    }
    @ApiOperation("修改打印次数")
    @PostMapping("/updatePrintNum")
    public Result updatePrintNum(
            @RequestBody List<Map<String, Object>> object
    ) {
        return Result.success(replenishService.updatePrintNumSv(object));
    }
}
north-glass-erp/src/main/java/com/example/erp/mapper/pp/PatchLogMapper.java
@@ -7,6 +7,7 @@
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
import com.github.yulichang.base.MPJBaseMapper;
import io.swagger.models.auth.In;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -55,5 +56,7 @@
    Integer selectProjectCount(String processId, String patchId, Integer technologyNumber);
    List<exportReplenishDTO> exportReplenishMp(List<LocalDate> dates);
    Boolean updatePrintNumMp(Integer id);
}
north-glass-erp/src/main/java/com/example/erp/service/pp/ReplenishService.java
@@ -432,5 +432,18 @@
    public List<exportReplenishDTO> exportReplenishSv(List<LocalDate> dates) {
        return patchMapper.exportReplenishMp(dates);
    }
    public Boolean updatePrintNumSv(List<Map<String, Object>> list) {
        if (!list.isEmpty()){
            for (Map<String, Object> item : list) {
                Integer id = (Integer) item.get("id");
                patchMapper.updatePrintNumMp(id);
            }
            return true;
        }else {
            return false;
        }
    }
}
north-glass-erp/src/main/resources/mapper/pp/FolwCard.xml
@@ -1284,7 +1284,7 @@
    </select>
    <select id="selectReplenishPrintMp">
        select fc.id,
        select pl.id,
               fc.order_id,
               fc.process_id,
               o.customer_name,
@@ -1309,7 +1309,8 @@
               pl.reporting_work_id,
               JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01'))                AS glassNumber,
               pl.patch_id,
               date(pl.create_time) as create_time
               date(pl.create_time) as create_time,
               pl.print_num
        from flow_card as fc
                 left join sd.order_glass_detail as ogd
north-glass-erp/src/main/resources/mapper/pp/PatchLogMapper.xml
@@ -474,4 +474,8 @@
        </where>
        order by r.review_status,r.id desc
    </select>
    <update id="updatePrintNumMp">
        update pp.patch_log set print_num=IFNULL(print_num,0)+1 where id=#{id}
    </update>
</mapper>