Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

chenlu

2024-03-08 f38b9b10de303806a8d27734dbbf0ff8815dba49

Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/CreateProductStock.vue

@@ -266,7 +266,7 @@
              request.post("/FinishedGoodsInventory/addSelectWarehousing",flowData.value).then((res) => {
                if(res.code==200){
                  ElMessage.success("入库成功")
                  location.reload();
                  router.push({path:'/main/productStock/CreateProductStock',query:{random:Math.random()}})
                }else{
                  ElMessage.warning(res.msg)
                  router.push("/login")

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedGoodsIssue.vue

@@ -64,7 +64,7 @@
          request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryTakeOut",flowData.value).then((res) => {
            if(res.code==200){
              ElMessage.success("领出成功")
              router.push({path: '/main/delivery/SelectOrderList'})
              router.push({path:'/main/productStock/FinishedGoodsIssue',query:{random:Math.random()}})
            }else{
              ElMessage.warning(res.msg)
              router.push("/login")

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductOut.vue

@@ -268,7 +268,7 @@
            request.post("/FinishedGoodsInventory/addDeliveryDetail",orderDetailData.value).then((res) => {
              if(res.code==200){
                ElMessage.success("出库成功")
                location.reload();
                router.push({path:'/main/productStock/FinishedProductOut',query:{random:Math.random()}})
              }else{
                ElMessage.warning(res.msg)
                router.push("/login")

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/FinishedProductRework.vue

@@ -63,8 +63,8 @@
          })
          request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryRework", flowData.value).then((res) => {
            if (res.code == 200) {
              location.reload();
              ElMessage.success("返工成功")
              router.push({path:'/main/productStock/FinishedProductRework',query:{random:Math.random()}})
            } else {
              ElMessage.warning(res.msg)
              router.push("/login")

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/OrderAllocation.vue

@@ -276,7 +276,7 @@
              if (res.code == 200) {

                ElMessage.success("调拨成功")
                location.reload();
                router.push({path:'/main/productStock/OrderAllocation',query:{random:Math.random()}})
              } else {
                ElMessage.warning(res.msg)
                router.push("/login")

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStock.vue

@@ -4,11 +4,11 @@
import request from "@/utils/request";
import deepClone from "@/utils/deepClone";
import {ElMessage} from "element-plus";
import {useRouter} from "vue-router";
import  GlassType from '@/components/basic/product/GlassType.vue'
import {useRouter,useRoute,onBeforeRouteUpdate} from "vue-router";


const router = useRouter()
const route = useRoute()
let indexFlag=$ref(1)
function changeRouter(index){
  indexFlag=index
@@ -33,7 +33,7 @@
    </div>

    <div id="main-body">
      <router-view  />
      <router-view  :key="route.fullPath" />
    </div>
  </div>
</template>

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ProductStockList.vue

@@ -183,7 +183,7 @@
    // { type: 'checkbox',fixed:"left", title: '选择', width: '80' },
    { type: 'seq',fixed:"left", title: '自序', width: '80' },
    // {title: '操作', width: '220', slots: { default: 'button_slot' },fixed:"left"},
    {field: 'orderDetail.orderNumber', width:'150', title: '订单序号', filters:[{ data: '' }],editRender: { name: 'input', attrs: { placeholder: '' } } },
    {field: 'orderDetail.orderNumber', width:'150', title: '订单序号', filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
    {field: 'order.orderId', width: '150',title: '销售单号',showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'order.project', width: '120',title: '项目名称',filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'order.orderType', width: '100',title: '订单类型', filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
@@ -220,19 +220,33 @@
    zoom: true,
    custom: true
  },
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    let footList = ['inventory','quantityAvailable','area']
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return `合计`
        }

        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
        }
        return ''
      })
    ]
  }

})

//表尾求和
const sumNum = (list, field) => {
  let count = 0
  list.forEach(item => {
    count += Number(item[field])
  })
  return count.toFixed(2)
}

const  xGrid = ref();
const gridEvents = {
  toolbarButtonClick({ code }) {

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/ReworkRecord.vue

@@ -250,10 +250,10 @@
              orderDetail:selectRecords

            })
            request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryCounterexamination",flowData.value).then((res) => {
            request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryCounterExamination",flowData.value).then((res) => {
              if(res.code==200){
                ElMessage.success("反审成功")
                location.reload();
                router.push({path:'/main/productStock/ReworkRecord',query:{random:Math.random()}})

              }else{
                ElMessage.warning(res.msg)

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TakeOutRecord.vue

@@ -256,7 +256,7 @@
            request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryToExamine",flowData.value).then((res) => {
              if(res.code==200){
                ElMessage.success("审核成功")
                location.reload();
                router.push({path:'/main/productStock/TakeOutRecord',query:{random:Math.random()}})

              }else{
                ElMessage.warning(res.msg)

 north-glass-erp/northglass-erp/src/views/mm/mainProductStock/TransferRecord.vue

@@ -247,7 +247,7 @@
            request.post("/FinishedGoodsInventory/updateFinishedGoodsInventoryCounterExamination",flowData.value).then((res) => {
              if(res.code==200){
                ElMessage.success("反审成功")
                location.reload();
                router.push({path:'/main/productStock/TransferRecord',query:{random:Math.random()}})

              }else{
                ElMessage.warning(res.msg)

 north-glass-erp/northglass-erp/src/views/pp/Replenish/AddReplenish.vue

@@ -29,7 +29,7 @@
request.post(`/Replenish/getSelectReplenish/${pageNum}/100`,filterData.value).then((res) => {

  if(res.code==200){

    console.log(res.data)
    produceList = deepClone(res.data)
    xGrid.value.loadData(produceList)
    gridOptions.loading=false
@@ -56,7 +56,7 @@
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 50},//鼠标移动或选择高亮
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  showFooter: true,//显示脚
  printConfig: {},
@@ -102,7 +102,7 @@
    {field: 'patchReason', width: 120, title: '次破原因', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
    {field: 'responsibleEquipment', width: 120, title: '责任设备', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'responsibleTeam', width: 120, title: '责任班组', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'qualityInsPector', width: 100, title: '质检员', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
    {field: 'qualityInspector', width: 100, title: '质检员', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
  ],//表头按钮

  toolbarConfig: {
@@ -117,11 +117,11 @@
  },
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    let footList=['流程卡数量','面积','次破数量']
    let footList=['patchNum']
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return '合计:'
          return '合计'
        }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
@@ -159,7 +159,7 @@
          request.post("/Replenish/saveReplenish", flowData.value).then((res) => {
            if(res.code==200){
              ElMessage.success("补片单提交成功")
              location.reload();
              router.push({path:'/main/Replenish/AddReplenish',query:{random:Math.random()}})
            }else{
              ElMessage.warning(res.msg)
              router.push("/login")

 north-glass-erp/northglass-erp/src/views/pp/Replenish/Replenish.vue

@@ -4,11 +4,12 @@
import request from "@/utils/request";
import deepClone from "@/utils/deepClone";
import {ElMessage} from "element-plus";
import {useRouter} from "vue-router";
import  GlassType from '@/components/basic/product/GlassType.vue'
import {useRouter,useRoute,onBeforeRouteUpdate} from "vue-router";


const router = useRouter()
const route = useRoute()
let indexFlag=$ref(1)
function changeRouter(index){
  indexFlag=index
@@ -27,7 +28,7 @@
    </div>

    <div id="main-body">
      <router-view  />
      <router-view  :key="route.fullPath" />
    </div>
  </div>
</template>

 north-glass-erp/northglass-erp/src/views/pp/Replenish/SelectReplenish.vue

@@ -85,7 +85,7 @@
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe:true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true,height: 50},//鼠标移动或选择高亮
  rowConfig: {isCurrent: true, isHover: true,height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  showFooter: true,//显示脚
  printConfig: {},
@@ -154,7 +154,7 @@
  },
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    let footList=['processCardNumber','numberBroken']
    let footList=['patch_num','patch_area']
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
@@ -179,7 +179,10 @@
          const $table = xGrid.value
          if ($table) {
            const selectRecords = $table.getCheckboxRecords()

            if (selectRecords.length === 0) {
              ElMessage.warning("未选中数据")
              return
            }
            let flowData = ref({

              userId:userid,
@@ -190,7 +193,7 @@
            request.post("/Replenish/updateReplenish",flowData.value).then((res) => {
              if(res.code==200){
                ElMessage.success("审核成功")
                location.reload();
                router.push({path:'/main/Replenish/SelectReplenish',query:{random:Math.random()}})

              }else{
                ElMessage.warning(res.msg)

 north-glass-erp/northglass-erp/src/views/pp/rework/AddRework.vue

@@ -65,7 +65,7 @@
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 50},//鼠标移动或选择高亮
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  showFooter: true,//显示脚
  printConfig: {},
@@ -121,7 +121,7 @@
    {field: 'responsibleEquipment', width: 120, title: '责任设备', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'responsibleTeam', width: 120, title: '责任班组', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'area', width: 120, title: '返工面积', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'qualityInsPector', width: 100, title: '质检员', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
    {field: 'qualityInspector', width: 100, title: '质检员', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged}
  ],//表头按钮

  toolbarConfig: {
@@ -136,7 +136,7 @@
  },
  //脚部求和
  footerMethod({columns, data}) {//页脚函数
    let footList = ['total', 'TotalArea']
    let footList = ['reworkNum', 'breakageQuantity']
    return [
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
@@ -178,7 +178,7 @@
          request.post("/rework/saveRework", flowData.value).then((res) => {
            if(res.code==200){
              ElMessage.success("返工单提交成功")
              location.reload();
              router.push({path:'/main/rework/AddRework',query:{random:Math.random()}})
            }else{
              ElMessage.warning(res.msg)
              router.push("/login")

 north-glass-erp/northglass-erp/src/views/pp/rework/Rework.vue

@@ -4,10 +4,11 @@
import request from "@/utils/request";
import deepClone from "@/utils/deepClone";
import {ElMessage} from "element-plus";
import {useRouter} from "vue-router";
import  GlassType from '@/components/basic/product/GlassType.vue'
import {useRouter,useRoute,onBeforeRouteUpdate} from "vue-router";


const router = useRouter()
const route = useRoute()
let indexFlag=$ref(1)
function changeRouter(index){
  indexFlag=index
@@ -25,7 +26,7 @@
    </div>

    <div id="main-body">
      <router-view  />
      <router-view  :key="route.fullPath" />
    </div>
  </div>
</template>

 north-glass-erp/northglass-erp/src/views/pp/rework/SelectRework.vue

@@ -64,6 +64,7 @@
request.post(`/rework/SelectRework/1/${total.pageSize}/${selectDate.value}`,filterData.value).then((res) => {

  if(res.code==200){
    console.log(res.data.data)
    total.dataTotal = res.data.total.total*1
    total.pageTotal= res.data.total.pageTotal

@@ -95,7 +96,7 @@
  keepSource: true,//保持源数据
  align: 'center',//文字居中
  stripe: true,//斑马纹
  rowConfig: {isCurrent: true, isHover: true, height: 50},//鼠标移动或选择高亮
  rowConfig: {isCurrent: true, isHover: true, height: 30},//鼠标移动或选择高亮
  id: 'CustomerList',
  showFooter: true,//显示脚
  printConfig: {},
@@ -160,17 +161,17 @@
    zoom: true,
    custom: true
  },
  data: null,//table body实际数据
  //脚部求和
  footerMethod ({ columns, data }) {//页脚函数
    let footList = ['rework_num','rework_area']
    return[
      columns.map((column, columnIndex) => {
        if (columnIndex === 0) {
          return `合计`
        }
        // if (props.tableProp.footList.includes(column.field)) {
        //   return sumNum(data, column.field)
        // }
        if (footList.includes(column.field)) {
          return sumNum(data, column.field)
        }
        return ''
      })
    ]
@@ -188,7 +189,10 @@
          //gridOptions.columns.unshift(a)
          if ($table) {
            const selectRecords = $table.getCheckboxRecords()

            if (selectRecords.length === 0) {
              ElMessage.warning("未选中数据")
              return
            }
            let flowData = ref({

              userId:userid,
@@ -199,7 +203,7 @@
            request.post("/rework/updateRework",flowData.value).then((res) => {
              if(res.code==200){
                ElMessage.success("审核成功")
                location.reload();
                router.push({path:'/main/rework/SelectRework',query:{random:Math.random()}})

              }else{
                ElMessage.warning(res.msg)

 north-glass-erp/northglass-erp/src/views/sd/delivery/CreateDelivery.vue

@@ -429,7 +429,7 @@
           request.post("/Delivery/insertDelivery", flowData.value).then((res) => {
             if(res.code==200){
               ElMessage.success("发货单提交成功")
               router.push({path: '/main/delivery/selectDelivery', query: { id: 1 }})
               router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
             }else{
               ElMessage.warning(res.msg)
               router.push("/login")
@@ -446,7 +446,7 @@
          request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
            if (res.code == 200) {
              ElMessage.success("审核成功")
              router.push({path: '/main/delivery/selectDelivery', query: {id: 1}})
              router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
            } else {
              ElMessage.warning(res.msg)
              router.push("/login")
@@ -463,7 +463,7 @@
          request.post("/Delivery/updateDeliveryToExamine", flowData.value).then((res) => {
            if (res.code == 200) {
              ElMessage.success("反审成功")
              router.push({path: '/main/delivery/selectDelivery', query: {id: 1}})
              router.push({path: '/main/delivery/selectDelivery', query:{random:Math.random()}})
            } else {
              ElMessage.warning(res.msg)
              router.push("/login")

 north-glass-erp/northglass-erp/src/views/sd/delivery/Delivery.vue

@@ -1,6 +1,11 @@
<script setup>
import {ArrowLeftBold, ArrowRight, Search} from "@element-plus/icons-vue"
import {useRouter} from "vue-router";

import {useRouter,useRoute,onBeforeRouteUpdate} from "vue-router";


const router = useRouter()
const route = useRoute()
let indexFlag=$ref(1)
function changeRouter(index){
  indexFlag=index
@@ -19,7 +24,7 @@
    </div>

    <div id="main-body">
      <router-view  />
      <router-view  :key="route.fullPath" />
    </div>
  </div>
</template>

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java

@@ -45,7 +45,7 @@
            return Result.seccess();

        }else {
            throw new ServiceException(Constants.Code_500,"返工失败");
            throw new ServiceException(Constants.Code_500,"补片失败");

        }
    }

 north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java

@@ -50,7 +50,7 @@
        }
    }

    @ApiOperation("审核接口")
    @ApiOperation("返工审核接口")
    @PostMapping("/updateRework")
    public Result updateRework( @RequestBody Map<String,Object> object){
        if(reworkService.updateRework(object)){

 north-glass-erp/src/main/java/com/example/erp/entity/pp/ReportingWork.java

@@ -55,7 +55,7 @@
    //备注
    private String notes;
    //质检员
    private String qualityInsPector;
    private String qualityInspector;
    //包装方式
    private String packagingMethod;
    //报工时间

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

@@ -14,5 +14,5 @@

    List<BasicDataProduce> SelectWorkBasicTeamsMp(String process);

    List<BasicDataProduce> SelectWorkBasicTeams();
    List<BasicDataProduce> SelectWorkBasicTeams(String process);
}

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

@@ -1,6 +1,7 @@
package com.example.erp.mapper.pp;

import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.entity.pp.Rework;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -26,7 +27,7 @@

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

    Boolean updateOrderProcessDetail(@Param("patchLog") PatchLog patchLog );
    Boolean updateOrderProcessDetail(@Param("patchLog") PatchLog patchLog,@Param("reportingWork") ReportingWork reportingWork );

    List<Map<String,Object>> getSelectReplenish(@Param("offset") Integer offset, @Param("pageSize") Integer pageSiz);


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

@@ -3,11 +3,14 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.PatchLog;
import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.entity.pp.Rework;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.pp.PatchLogMapper;
import com.example.erp.mapper.pp.ReportingWorkMapper;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -23,11 +26,20 @@
@DS("pp")
@Transactional(rollbackFor = Exception.class)
public class ReplenishService {
    @Autowired
    final
    PatchLogMapper patchMapper;

    @Autowired
    final
    SysErrorService sysErrorService;

    final
    ReportingWorkMapper reportingWorkMapper;

    public ReplenishService(PatchLogMapper patchMapper, SysErrorService sysErrorService, ReportingWorkMapper reportingWorkMapper) {
        this.patchMapper = patchMapper;
        this.sysErrorService = sysErrorService;
        this.reportingWorkMapper = reportingWorkMapper;
    }


    public List<Map<String, Object>> getSelectReplenish(Integer pageNum, Integer pageSize) {
@@ -114,9 +126,12 @@
            if (!patchLoglist.isEmpty()){
                for (PatchLog patchLog : patchLoglist) {
                    //审核
                    patchMapper.updateReplenish(patchLog,userName);
                   patchMapper.updateReplenish(patchLog,userName);
                    ReportingWork reportingWork = reportingWorkMapper
                            .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
                    System.out.println(reportingWork.getReportingWorkId());
                    //修改小片流程卡数量
                    patchMapper.updateOrderProcessDetail(patchLog);
                    patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
                }
            }


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

@@ -41,11 +41,12 @@


        List<Map<String, Object>> ReworkMap =reworkMapper.getSelectRework(offset,pageSize);
        List<BasicDataProduce> basicDataProduceList=basicDateProduceMapper.SelectWorkBasicTeams();


        for (Map<String, Object> item:ReworkMap){
            item.put("reworkTeam","");
            List<BasicDataProduce> basicCategory=new ArrayList<>();
            List<BasicDataProduce> basicDataProduceList=basicDateProduceMapper.SelectWorkBasicTeams(item.get("reworkProcesses").toString());
            for (BasicDataProduce basicDataProduce:basicDataProduceList){
                if(Objects.equals(basicDataProduce.getBasicData().getBasicName(),item.get("reworkProcesses"))){
                    basicCategory.add(basicDataProduce);

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

@@ -37,7 +37,7 @@
        select bdp.basic_name ,bd.basic_name as d_basic_name
        from pp.basic_data_produce bdp
                 left join sd.basic_data bd on bdp.basic_category = bd.id
        where bd.basic_name = "切割"
        where bd.basic_name = #{process}
          and bdp.basic_type = "teamsgroups"
    </select>
</mapper>

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

@@ -46,7 +46,7 @@
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
        </where>
         order by r.review_status
         order by r.review_status,r.id desc
        limit #{offset},#{pageSize};
    </select>

@@ -89,10 +89,20 @@
    </update>

    <update id="updateOrderProcessDetail"  >
        update sd.order_process_detail set reporting_work_num=reporting_work_num-#{patchLog.patchNum} where order_id=#{patchLog.orderId} and
        order_number=#{patchLog.orderSort} and technology_number=#{patchLog.technologyNumber} and id <![CDATA[<]]> (select a.opdid from(select id as opdid from
        sd.order_process_detail opd where opd.order_id=#{patchLog.orderId} and opd.order_number=#{patchLog.orderSort} and opd.technology_number=#{patchLog.technologyNumber}
        and process=#{patchLog.patchProcesses}) as a)
        update sd.order_process_detail
        set reporting_work_num=reporting_work_num - #{patchLog.patchNum}
        where order_id = #{patchLog.orderId}
          and process_id = #{patchLog.processId}
          and order_number = #{patchLog.orderSort}
          and technology_number = #{patchLog.technologyNumber}
          and id <![CDATA[<]]> (select a.opdid
                       from (select id as opdid
                             from sd.order_process_detail opd
                             where opd.order_id = #{patchLog.orderId}
                               and opd.process_id = #{patchLog.processId}
                               and opd.order_number = #{patchLog.orderSort}
                               and opd.technology_number = #{patchLog.technologyNumber}
                               and process = #{reportingWork.thisProcess}) as a)
    </update>

    <update id="updateDamageDetails"  >
@@ -118,6 +128,7 @@
               od.width,
               od.height,
               od.shape,
               dd.responsible_process as patchProcesses,
               dd.breakage_quantity-dd.quantity as breakageQuantity,
               dd.return_process as patchProcesses,
               dd.breakage_reason as patchReason,
@@ -126,7 +137,7 @@
               dd.responsible_equipment as responsibleEquipment,
               dd.responsible_team as responsibleTeam,
               ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as patchArea,
               rw.qualityIns_pector as qualityInsPector
               rw.quality_inspector as qualityInspector
        from pp.damage_details dd
                 left join    pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number  and dd.technology_number=rwd.technology_number
                 left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id
@@ -137,7 +148,7 @@
                           on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number

        where  dd.breakage_quantity-dd.quantity>0 and dd.available=0 and (dd.responsible_process=rw.this_process or (dd.responsible_process!=rw.this_process and dd.qualityIns_status=1))

        order by dd.id desc
    </select>



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

@@ -45,7 +45,7 @@
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
        </where>
         order by r.review_status
         order by r.review_status,r.id desc
        limit #{offset},#{pageSize};
    </select>

@@ -88,7 +88,7 @@
               dd.responsible_equipment as responsibleEquipment,
               dd.responsible_team as responsibleTeam,
               ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as reworkArea,
               rw.qualityIns_pector as qualityInsPector
               rw.quality_inspector as qualityInspector
        from pp.damage_details dd
                 left join    pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number  and dd.technology_number=rwd.technology_number
                 left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id
@@ -98,7 +98,7 @@
                 left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
                           on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number

        where  dd.breakage_quantity-dd.quantity>0 and dd.available=1 and dd.qualityIns_status=1
        where  dd.breakage_quantity-dd.quantity>0 and dd.available=1 and dd.qualityIns_status=1 order by dd.id

    </select>

@@ -123,7 +123,7 @@
    </insert>

    <update id="updateRework"  >
        update pp.rework set reviewer=#{userName},review_status=1,update_time=now() where rework_id=#{rework.id}
        update pp.rework set reviewer=#{userName},review_status=1,update_time=now() where id=#{rework.id}
    </update>

    <update id="updateDamageDetails"  >

 north-glass-erp/src/main/resources/mapper/sd/Delivery.xml

@@ -122,7 +122,7 @@
                and fgi.quantity_available REGEXP #{order.finishedGoodsInventory.quantityAvailable}
            </if>
        </where>
        group by o.order_id
        group by o.order_id order by o.id desc
        limit #{offset},#{pageSize};
    </select>


 north-glass-erp/src/main/resources/mapper/sd/DeliveryDetail.xml

@@ -192,6 +192,7 @@
            </if>

        </where>
        order by dd.id desc
        limit #{offset},#{pageSize};
    </select>


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

@@ -37,7 +37,7 @@
        select bdp.basic_name ,bd.basic_name as d_basic_name
        from pp.basic_data_produce bdp
                 left join sd.basic_data bd on bdp.basic_category = bd.id
        where bd.basic_name = "切割"
        where bd.basic_name = #{process}
          and bdp.basic_type = "teamsgroups"
    </select>
</mapper>

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

@@ -46,7 +46,7 @@
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
        </where>
         order by r.review_status
         order by r.review_status,r.id desc
        limit #{offset},#{pageSize};
    </select>

@@ -89,10 +89,20 @@
    </update>

    <update id="updateOrderProcessDetail"  >
        update sd.order_process_detail set reporting_work_num=reporting_work_num-#{patchLog.patchNum} where order_id=#{patchLog.orderId} and
        order_number=#{patchLog.orderSort} and technology_number=#{patchLog.technologyNumber} and id <![CDATA[<]]> (select a.opdid from(select id as opdid from
        sd.order_process_detail opd where opd.order_id=#{patchLog.orderId} and opd.order_number=#{patchLog.orderSort} and opd.technology_number=#{patchLog.technologyNumber}
        and process=#{patchLog.patchProcesses}) as a)
        update sd.order_process_detail
        set reporting_work_num=reporting_work_num - #{patchLog.patchNum}
        where order_id = #{patchLog.orderId}
          and process_id = #{patchLog.processId}
          and order_number = #{patchLog.orderSort}
          and technology_number = #{patchLog.technologyNumber}
          and id <![CDATA[<]]> (select a.opdid
                       from (select id as opdid
                             from sd.order_process_detail opd
                             where opd.order_id = #{patchLog.orderId}
                               and opd.process_id = #{patchLog.processId}
                               and opd.order_number = #{patchLog.orderSort}
                               and opd.technology_number = #{patchLog.technologyNumber}
                               and process = #{reportingWork.thisProcess}) as a)
    </update>

    <update id="updateDamageDetails"  >
@@ -118,6 +128,7 @@
               od.width,
               od.height,
               od.shape,
               dd.responsible_process as patchProcesses,
               dd.breakage_quantity-dd.quantity as breakageQuantity,
               dd.return_process as patchProcesses,
               dd.breakage_reason as patchReason,
@@ -126,7 +137,7 @@
               dd.responsible_equipment as responsibleEquipment,
               dd.responsible_team as responsibleTeam,
               ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as patchArea,
               rw.qualityIns_pector as qualityInsPector
               rw.quality_inspector as qualityInspector
        from pp.damage_details dd
                 left join    pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number  and dd.technology_number=rwd.technology_number
                 left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id
@@ -137,7 +148,7 @@
                           on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number

        where  dd.breakage_quantity-dd.quantity>0 and dd.available=0 and (dd.responsible_process=rw.this_process or (dd.responsible_process!=rw.this_process and dd.qualityIns_status=1))

        order by dd.id desc
    </select>



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

@@ -45,7 +45,7 @@
        <where>
            date(r.create_time)>=#{startDate} and date(r.create_time) &lt;= #{endDate}
        </where>
         order by r.review_status
         order by r.review_status,r.id desc
        limit #{offset},#{pageSize};
    </select>

@@ -88,7 +88,7 @@
               dd.responsible_equipment as responsibleEquipment,
               dd.responsible_team as responsibleTeam,
               ROUND((dd.breakage_quantity-dd.quantity) * od.width * od.height / 1000000, 2) as reworkArea,
               rw.qualityIns_pector as qualityInsPector
               rw.quality_inspector as qualityInspector
        from pp.damage_details dd
                 left join    pp.reporting_work_detail rwd on dd.reporting_work_id = rwd.reporting_work_id and dd.order_number=rwd.order_number  and dd.technology_number=rwd.technology_number
                 left join pp.reporting_work rw on dd.reporting_work_id = rw.reporting_work_id
@@ -98,7 +98,7 @@
                 left join (select * from sd.order_glass_detail group by order_id,order_number) as ogd
                           on rw.order_id = ogd.order_id and dd.order_number = ogd.order_number

        where  dd.breakage_quantity-dd.quantity>0 and dd.available=1 and dd.qualityIns_status=1
        where  dd.breakage_quantity-dd.quantity>0 and dd.available=1 and dd.qualityIns_status=1 order by dd.id

    </select>

@@ -123,7 +123,7 @@
    </insert>

    <update id="updateRework"  >
        update pp.rework set reviewer=#{userName},review_status=1,update_time=now() where rework_id=#{rework.id}
        update pp.rework set reviewer=#{userName},review_status=1,update_time=now() where id=#{rework.id}
    </update>

    <update id="updateDamageDetails"  >