Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

chenlu

2024-04-25 f0957ff7692bbf4f721121ed695df01f4c6d640d

Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

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

@@ -88,8 +88,8 @@
  printConfig: {},
  importConfig: {},
  exportConfig: {},
  scrollY:{ enabled: true,gt:15 },//开启虚拟滚动
  scrollX:{ enabled: true,gt:30 },//开启虚拟滚动
  scrollY:{ enabled: true,gt:13 },//开启虚拟滚动
  //scrollX:{ enabled: true,gt:15 },//开启虚拟滚动
  showOverflow:true,
  menuConfig: {
    body: {

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

@@ -126,6 +126,7 @@
                   patchMapper.updateReplenish(patchLog,userName);
                    ReportingWork reportingWork = reportingWorkMapper
                            .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
                    System.out.println(patchLog);
                    //修改小片流程卡数量
                    patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
                }

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

@@ -22,7 +22,7 @@
        o.batch,
        od.building_number,
        od.product_name,
        ogd.technology_number,
        r.technology_number,
        ogd.glass_address,
        r.patch_num,
        od.width,
@@ -88,6 +88,7 @@
        update pp.patch_log set reviewer=#{userName},review_status=1,update_time=now() where id=#{patchLog.id}
    </update>


    <update id="updateOrderProcessDetail"  >
        update sd.order_process_detail
        set reporting_work_num=reporting_work_num - #{patchLog.patchNum}

 north-glass-erp/target/classes/mapper/pp/PatchLogMapper.xml

@@ -22,7 +22,7 @@
        o.batch,
        od.building_number,
        od.product_name,
        ogd.technology_number,
        r.technology_number,
        ogd.glass_address,
        r.patch_num,
        od.width,
@@ -88,6 +88,7 @@
        update pp.patch_log set reviewer=#{userName},review_status=1,update_time=now() where id=#{patchLog.id}
    </update>


    <update id="updateOrderProcessDetail"  >
        update sd.order_process_detail
        set reporting_work_num=reporting_work_num - #{patchLog.patchNum}

 north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original

Binary files differ