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

chenlu

2024-07-16 111c832078987cf3c21ae18218ff9daf2c85869d

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

 north-glass-erp/northglass-erp/src/components/sd/order/PrintFoot.vue

@@ -11,11 +11,11 @@
      <el-col :span="4">审核人：{{props.order.verifier}}</el-col>
      <el-col :span="4">校对：</el-col>
    </el-row>
    <el-row style="text-align: left ">
      <el-col :span="4">创建时间：{{props.order.createTime}}</el-col>
      <el-col :span="4">审核时间：{{props.order.updateTime}}</el-col>
      <el-col :span="4">打印时间：</el-col>
    </el-row>
<!--    <el-row style="text-align: left ">-->
<!--      <el-col :span="4">创建时间：{{props.order.createTime}}</el-col>-->
<!--      <el-col :span="4">审核时间：{{props.order.updateTime}}</el-col>-->
<!--      <el-col :span="4">打印时间：</el-col>-->
<!--    </el-row>-->
  </div>
</template>


 north-glass-erp/src/main/resources/application.yml

@@ -2,6 +2,7 @@
server:
  port: 8086

ip: localhost


spring:
@@ -11,27 +12,27 @@
      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
      datasource:
        user_info:
          url: jdbc:mysql://localhost:3306/erp_user_info?serverTimezone=GMT%2b8
          url: jdbc:mysql://${ip}:3306/erp_user_info?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        sd:
          url: jdbc:mysql://localhost:3306/sd?serverTimezone=GMT%2b8&allowMultiQueries=true
          url: jdbc:mysql://${ip}:3306/sd?serverTimezone=GMT%2b8&allowMultiQueries=true
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        mm:
          url: jdbc:mysql://localhost:3306/mm?serverTimezone=GMT%2b8
          url: jdbc:mysql://${ip}:3306/mm?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        pp:
          url: jdbc:mysql://localhost:3306/pp?serverTimezone=GMT%2b8
          url: jdbc:mysql://${ip}:3306/pp?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver
        log:
          url: jdbc:mysql://localhost:3306/erp_log?serverTimezone=GMT%2b8
          url: jdbc:mysql://${ip}:3306/erp_log?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver

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

@@ -129,8 +129,8 @@
            ogd.child_width,
            ogd.child_height,
            if(od.shape=1,'普形',if(od.shape=2,'异形','')) as shape,
            fc.quantity -odpd.reporting_work_num -odpd.broken_num  as quantity,
            fc.quantity -odpd.reporting_work_num -odpd.broken_num  as completedQuantity,
            fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(patch.patch_num,0)  as quantity,
            fc.quantity -odpd.reporting_work_num -odpd.broken_num + ifnull(patch.patch_num,0)   as completedQuantity,
            odpd.reporting_work_num as completed,
            odpd.broken_num as onceBroken,
            if(fc.quantity -odpd.reporting_work_num = 0 ,true,false) as saveFlag, -- 判断是否已经完成，已经完成不序号和同序号数量相同才能提交
@@ -150,6 +150,18 @@
            AND odpd.order_number = fc.order_number
            AND odpd.technology_number = fc.technology_number
            and  odpd.process_id = fc.process_id
        left join (
                select ifnull(sum(a.patch_num),0) as patch_num,a.process_id,a.technology_number,a.order_sort
                from patch_log as a
                where a.process_id=#{processIdStr}
                and a.technology_number =  #{technologyStr}
                and a.review_status = 1
                group by a.process_id,a.order_sort,a.technology_number
            ) as patch
        on patch.process_id = fc.process_id
        and patch.order_sort = fc.order_number
        and patch.technology_number = fc.technology_number

        WHERE
            fc.process_id = #{processIdStr}
          AND fc.technology_number = #{technologyStr}