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

guoyuji

2024-07-16 03df078310b88f2b4472c07ed9a09278b425ee00

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

 north-glass-erp/northglass-erp/src/views/pp/processCard/AddProcessCard.vue

@@ -84,12 +84,13 @@
    orderOtherMoney.value.forEach(item => {
      let column = {
        field: `${item.column}`,
        width: 60,
        width: 85,
        title: item.alias,
        filters: [{data: ''}],
        slots: {filter: 'num1_filter'},
        filterMethod: filterChanged,
      }

      //columns.push(column)
      console.log(column)
      gridOptions.columns.push(column)

    })
@@ -202,7 +203,10 @@
    {field: 'computeGrossArea', title: t('processCard.areaToDivided'), width: '80px'},
    {field: 'totalThickness', title: t('processCard.totalThickness'), width: '80px'},
    {field: 'thickness', title: t('processCard.glassThickness'), width: '80px'},
    {field: 'weight', title: t('processCard.weight'), slots: {default: 'weight_sum'}, width: '85px'}
    {field: 'weight', title: t('processCard.weight'), slots: {default: 'weight_sum'}, width: '85px'},
    {field: 'remarks', title: t('processCard.notes'),  width: '85px',filters: [{data: ''}],
      slots: {filter: 'num1_filter'},
      filterMethod: filterChanged}
  ],//表头按钮

  toolbarConfig: {

 north-glass-erp/northglass-erp/src/views/pp/processCard/PrintCustomLabelSemi2.vue

@@ -140,25 +140,26 @@
  display: flex;
  justify-content: left;
  flex-wrap: wrap;
  margin-left: 5px;
  width: 400px;
}

#entirety{
  text-align: center;
  width: 50%;
  height: 105px;
  height: 150px;
  border: black 1px;
}

.row1 {
  font-size: 12pt;
  font-weight: bold;
  height: 25px;
  height: 35px;
}

.row2 {
  font-size: 12pt;
  font-weight: bold;
  height: 25px;
  height: 30px;
}
span {
  font-size: 12pt;
@@ -170,10 +171,11 @@
  height: 30px;
  font-size: 20pt;
  font-weight: bolder;
  line-height: 30px;
}

.row5 {
  height: 25px;
  height: 40px;
  font-weight: bold;
  font-size: 12pt;
}

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/AddReportingWork.vue

@@ -815,6 +815,7 @@
}

const saveReportingWorkRequest = (requestData) =>{
  //request.post(`/reportingWork/saveReportingWorkLog`, requestData)
  request.post(`/reportingWork/saveReportingWork`,requestData).then(res =>{
    if (res.code == 200){
      ElMessage.success(t('reportingWorks.successfulJobApplication'))

 north-glass-erp/northglass-erp/src/views/pp/reportingWorks/QualityInspectionReview.vue

@@ -105,7 +105,7 @@

//获取七天前到当前时间
function getNowTime() {
  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 3)
  const start = new Date(new Date().getTime() - 3600 * 1000 * 24 * 7)
      .toISOString()
      .replace('T', ' ')
      .slice(0, 10) //默认开始时间7天前

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

@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.pp.BasicDataProduce;
import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.entity.sd.OrderGlassDetail;
import org.apache.ibatis.annotations.Mapper;

import java.sql.Date;
@@ -19,7 +18,7 @@

    List<BasicDataProduce> SelectWorkBasicTeamsMp(String process);

    String SelectTechnologicalProcess(String processIdStr);
    String SelectTechnologicalProcess(String processIdStr, String technologyStr);

    String SelectWorkTechnologyMp(String processIdStr);


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

@@ -5,14 +5,12 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper;
import com.example.erp.common.Constants;
import com.example.erp.entity.pp.DamageDetails;
import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.entity.pp.ReportingWorkDetail;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderProcessDetail;
import com.example.erp.exception.ServiceException;
import com.example.erp.mapper.pp.*;
@@ -20,7 +18,6 @@
import com.example.erp.mapper.sd.OrderMapper;
import com.example.erp.mapper.sd.OrderProcessDetailMapper;
import com.example.erp.service.sd.OrderProcessDetailService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -66,7 +63,7 @@
    public Map<String, Object> AddSelectLastWorkSv(String processIdStr, String technologyStr, String process) {
        Map<String, Object> map = new HashMap<>();
        //查询流程卡工艺流程
        String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(processIdStr);
        String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(processIdStr,technologyStr);



@@ -203,7 +200,7 @@
                });
            }
            //查询流程卡工艺流程
            String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(reportingWork.getProcessId());
            String technologicalProcess = reportingWorkMapper.SelectTechnologicalProcess(reportingWork.getProcessId(), reportingWorkDetail.getTechnologyNumber());

            int index = technologicalProcess.indexOf("-");
            String interceptProcess = "";

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

@@ -246,7 +246,7 @@
               p.total_thickness     AS 'totalThickness',
               p.thickness,
               od.weight,
               od.weight,
               od.remarks,
               ods.S01,
               ods.S02,
               ods.S03,

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

@@ -105,6 +105,7 @@
        select ogd.process
        from sd.order_glass_detail as ogd
        where ogd.production_id = LEFT(#{processIdStr}, 11)
          and ogd.technology_number=#{technologyStr}
        limit 1

    </select>
@@ -704,7 +705,7 @@
        update reporting_work as rw left join damage_details as dd on rw.reporting_work_id = dd.reporting_work_id
        set dd.quality_ins_status = 2,
            rw.quality_inspector=#{username},
            rw.examine_time=NOW()
            rw.quality_ins_time=NOW()
        where rw.reporting_work_id = #{reportingWorkId}
    </update>


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

@@ -10,7 +10,7 @@
        from
            sd.`order` as o
        where
            o.quantity=#{order.quantity} and o.area=#{order.area} and o.project=#{order.project} and o.customer_id=#{order.customerId} and o.money=#{order.money}
            o.quantity=#{order.quantity} and o.area=#{order.area} and o.project=#{order.project} and o.customer_id=#{order.customerId}
    </select>

    <select id="selectMaxOrderId">