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

廖井涛

2024-09-03 c4b73a85c275dc47e8478a28333c70ca279b6557

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

 north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabel.vue

@@ -105,6 +105,7 @@
    const prefix = obj.processId.substring(0, 11);
    const orderId = obj.orderId;
    const glassNumber=lastList.value[id].glassNumber
    const customerName = obj.customerName
    // 根据 propertyName 更新属性
    if (propertyName === 'productAbbreviation' && prefix === obj.processId.substring(0, 11)) {
      obj.productAbbreviation = result;
@@ -113,9 +114,12 @@
    if (propertyName === 'project' && orderId === obj.orderId) {
      obj.project = result;
    }
    if (propertyName === 'productName' && glassNumber === obj.glassNumber){
    if (propertyName === 'productName' && prefix === obj.processId.substring(0, 11)){
      obj.productName = result;
    }
    if (propertyName === 'customerName' && orderId === obj.orderId){
      obj.customerName = result;
    }
  });
}


 north-glass-erp/northglass-erp/src/components/pp/PrintCustomLabelDetails.vue

@@ -114,9 +114,12 @@
    if (propertyName === 'project' && orderId === obj.orderId) {
      obj.project = result;
    }
    if (propertyName === 'productName' && glassNumber === obj.glassNumber){
    if (propertyName === 'productName' && prefix === obj.processId.substring(0, 11)){
      obj.productName = result;
    }
    if (propertyName === 'customerName' && orderId === obj.orderId){
      obj.customerName = result;
    }
  });
}


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

@@ -203,7 +203,6 @@

              }else{
                ElMessage.warning(t('basicData.msg.reviewFail'))
                router.push("/login")
              }
            })
          }

 north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue

@@ -62,12 +62,12 @@
  {field: 'process_id',width: 150, title: t('processCard.processId'),filters: [{data: ''}],
    slots: {filter: 'num1_filter'},
    filterMethod: filterChanged},
  {field: 'order_number', width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
    slots: {filter: 'num1_filter'},
    filterMethod: filterChanged},
  {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
    slots: {filter: 'num1_filter'},
    filterMethod: filterChanged},
  // {field: 'order_number', width: 90,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
  //   slots: {filter: 'num1_filter'},
  //   filterMethod: filterChanged},
  // {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
  //   slots: {filter: 'num1_filter'},
  //   filterMethod: filterChanged},
  {field: 'technology_number', width: 110,title: t('processCard.technologyNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
    slots: {filter: 'num1_filter'},
    filterMethod: filterChanged},

 north-glass-erp/northglass-erp/src/views/pp/report/ProductionSchedule.vue

@@ -58,7 +58,10 @@
const columns = [
  {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
  {field: 'order_number', width: 150, title: t('order.OrderNum'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
  {field: 'shape',width: 130, title: t('order.shape') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
  //{field: 'shape',width: 130, title: t('order.shape') ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
  {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
    slots: {filter: 'num1_filter'},
    filterMethod: filterChanged},
  {field: 'product_name', width: 120,title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
  {field: 'child_width',width: 110, title: t('order.width'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
  {field: 'child_height', width: 90,title: t('order.height'),showOverflow:"ellipsis"},

 north-glass-erp/northglass-erp/src/views/pp/report/Yield.vue

@@ -394,7 +394,7 @@
<style scoped>
.main-div-customer {
  width: 99%;
  height: 100%;
  height: 95%;
}

#selectForm {

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

@@ -142,12 +142,21 @@
            List<PatchLog> patchLoglist = JSONArray.parseArray(JSONObject.toJSONString(object.get("patchLog")), PatchLog.class);
            if (!patchLoglist.isEmpty()){
                for (PatchLog patchLog : patchLoglist) {
                    //审核
                   patchMapper.updateReplenish(patchLog,userName);


                    ReportingWork reportingWork = reportingWorkMapper
                            .selectOne(new QueryWrapper<ReportingWork>().eq("reporting_work_id",patchLog.getReportingWorkId()));
                    //修改小片流程卡数量
                    patchMapper.updateOrderProcessDetail(patchLog,reportingWork);
                    //审核
                    patchMapper.updateReplenish(patchLog,userName);

                    Log log = new Log();
                    log.setContent(object.toString());
                    log.setFunction("updateReplenish补片审核");
                    log.setOperatorId((String) object.get("userId"));
                    log.setOperator((String) object.get("userName"));
                    logService.saveLog(log);
                }
            }

@@ -156,7 +165,7 @@
            //将异常传入数据库
            SysError sysError = new SysError();
            sysError.setError(e.toString());
            sysError.setFunc("saveOrder");
            sysError.setFunc("updateReplenish");
            sysErrorService.insert(sysError);
            saveState = false;


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

@@ -273,6 +273,7 @@

            //判断是否大于当前数量并且抛出异常
            if (processNum < (reportingWorkDetail.getBreakageQuantity() + reportingWorkDetail.getCompletedQuantity())) {
                System.out.println(processNum+"--"+reportingWorkDetail.getBreakageQuantity()+"--"+reportingWorkDetail.getCompletedQuantity());
                Map<String, Object> map = new HashMap<>();
                map.put("orderNumber", reportingWorkDetail.getOrderNumber());
                map.put("technologyNumber", reportingWorkDetail.getOrderNumber());
@@ -651,11 +652,14 @@
                            .eq(ReportingWork::getProcessId,reportingWork.getProcessId())
                            .eq(ReportingWork::getThisProcess,reportingWork.getThisProcess())
                            .eq(ReportingWork::getDeviceName,reportingWork.getDeviceName())
                            .eq(ReportingWorkDetail::getOrderNumber,reportingWorkDetail.getOrderNumber())
                            .eq(ReportingWork::getReviewedState,0)//审核状态等于0，未删除
                            .eq(ReportingWork::getThisWornQuantity,0)
                            .eq(ReportingWorkDetail::getTechnologyNumber,reportingWorkDetail.getTechnologyNumber())
                            .orderByDesc(ReportingWork::getId)

            );


            //判断报工表是否存在，不存在则新增报工主副表数据，存在则修改副表数据
            if(ReportingWorks.isEmpty()){
                //获取当前最大报工单号生成报工单号
@@ -672,12 +676,34 @@
                reportingWorkMapper.insert(reportingWork);
                reportingWorkDetailMapper.insert(reportingWorkDetail);
            }else{
                LambdaUpdateWrapper<ReportingWorkDetail> detailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
                detailLambdaUpdateWrapper.eq(ReportingWorkDetail::getReportingWorkId, ReportingWorks.get(0).getReportingWorkId() )
                        .eq(ReportingWorkDetail::getOrderNumber,reportingWorkDetail.getOrderNumber())
                        .eq(ReportingWorkDetail::getTechnologyNumber,reportingWorkDetail.getTechnologyNumber())
                        .setSql("completed_quantity = completed_quantity+" + reportingWorkDetail.getCompletedQuantity());
                reportingWorkDetailMapper.update(null, detailLambdaUpdateWrapper);

                ReportingWorkDetail reportingWorkDetail1 = reportingWorkDetailMapper.selectOne(
                        new LambdaQueryWrapper<ReportingWorkDetail>()
                                .eq(ReportingWorkDetail::getReportingWorkId,ReportingWorks.get(0).getReportingWorkId())
                                .eq(ReportingWorkDetail::getOrderNumber,reportingWorkDetail.getOrderNumber())
                                .eq(ReportingWorkDetail::getTechnologyNumber,reportingWorkDetail.getTechnologyNumber())
                );

                if(reportingWorkDetail1 == null){
                    reportingWorkDetail.setReportingWorkId(ReportingWorks.get(0).getReportingWorkId());
                    reportingWorkDetailMapper.insert(reportingWorkDetail);
                }else{
                    LambdaUpdateWrapper<ReportingWorkDetail> detailLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
                    detailLambdaUpdateWrapper.eq(ReportingWorkDetail::getReportingWorkId, ReportingWorks.get(0).getReportingWorkId() )
                            .eq(ReportingWorkDetail::getOrderNumber,reportingWorkDetail.getOrderNumber())
                            .eq(ReportingWorkDetail::getTechnologyNumber,reportingWorkDetail.getTechnologyNumber())
                            .setSql("completed_quantity = completed_quantity+" + reportingWorkDetail.getCompletedQuantity());
                    reportingWorkDetailMapper.update(null, detailLambdaUpdateWrapper);
                }




                LambdaUpdateWrapper<ReportingWork> reportingWorkLambdaUpdateWrapper = new LambdaUpdateWrapper<>();
                reportingWorkLambdaUpdateWrapper
                        .eq(ReportingWork::getReportingWorkId, ReportingWorks.get(0).getReportingWorkId() )
                        .setSql("this_completed_quantity = this_completed_quantity+" + reportingWorkDetail.getCompletedQuantity());
                reportingWorkMapper.update(null, reportingWorkLambdaUpdateWrapper);

            }


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

@@ -509,12 +509,10 @@
                                          ogds.child_height
                                   from sd.order_glass_detail as ogds
                                   where ogds.order_id = #{orderId}
                                   GROUP BY order_id, order_number, ogds.glass_child, process, ogds.child_width,
                                            ogds.child_height) as ogdss
                                   GROUP BY order_id, order_number, ogds.glass_child, process) as ogdss
                                  on fc.order_id = ogdss.order_id and ogdss.order_number = fc.order_number
               where fc.order_id = #{orderId}
               GROUP BY fc.process_id, ogdss.concatenated_glass_child, ogdss.processed_part, ogdss.child_width,
                        ogdss.child_height
               GROUP BY fc.process_id, ogdss.concatenated_glass_child, ogdss.processed_part
               order by fc.process_id, ogdss.technology_number)

              UNION

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

@@ -689,7 +689,8 @@
               ifnull(f.inventory, 0)                               as inventoryNum,
               round(ifnull(f.inventory, 0) * a.area, 2)            as inventoryArea,
               ifnull(dd.quantity, 0)                               as shippedQuantity,
               ifnull(dd.area, 0)                                   as area
               ifnull(dd.area, 0)                                   as area,
               JSON_UNQUOTE(JSON_EXTRACT(a.other_columns, '$.S01')) AS glassNumber

        from flow_card as c
                 left join

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

@@ -389,14 +389,14 @@
                                   and b.order_id = SUBSTR(#{processId} from 1 for 10)
                                   and b.process = #{thisProcess}
                                   and b.process_id = a.process_id
                 left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id
                 left join (select sum(patch_num) as patchNumSum,order_sort,technology_number,process_id,patch_processes
                            from patch_log
                            group by order_sort,technology_number) as c
                            group by process_id,order_sort,technology_number,patch_processes) as c
                           on
                                       c.process_id = a.process_id
                                   and c.order_sort = a.order_number
                                   and c.technology_number = a.technology_number

                                   and c.patch_processes= #{thisProcess}
        where
            a.process_id=SUBSTR(#{processId} from 1 for 14)
          and a.order_number = #{orderNumber}

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

@@ -75,6 +75,7 @@
        from order_process_detail
        where order_id = #{orderId}
        group by process
        order by id

    </select>