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

廖井涛

2024-05-22 bd03748adb5b9fda8ac4b52c8de93062eaa8ee72

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

 north-glass-erp/northglass-erp/src/views/pp/machine/MaintenanceAndRepair.vue

@@ -70,14 +70,14 @@

//定义接收加载弹窗的值
const getBasicData = ref({
  deviceName: '',
  device_name: '',
  type: '',
  faultTime: '',
  faultReason: '',
  maintenanceTime: '',
  maintenanceIllustrate: '',
  startTime: '',
  stopTime: '',
  fault_time: '',
  fault_reason: '',
  maintenance_time: '',
  maintenance_illustrate: '',
  start_time: '',
  stop_time: '',
  process: '',
  personnel: '',
  cost: '',
@@ -235,15 +235,19 @@

const updateBasic = () => {

  // request.post(`/basicDataProduce/updateBasic/${id}/${process}/${name}/${type}`).then((res) => {
  //   if (res.code == 200) {
  //     ElMessage.success(t('processCard.modifySuccessfully'))
  //     router.push({path: '/main/productionBasicData/SelectProductionBasicData', query: {random:Math.random()}})
  //   } else {
  //
  //     ElMessage.warning(res.msg)
  //   }
  // })

  let machineData = ref({
    machine: getBasicData.value
  })
  request.post(`/maintenance/updateMaintenance`,machineData.value).then((res) => {
    if (res.code == 200 && res.data===true) {
      ElMessage.success(t('processCard.modifySuccessfully'))
      router.push({path: '/main/machine/MaintenanceAndRepair', query: {random:Math.random()}})
    } else {

      ElMessage.warning(res.msg)
    }
  })
}

</script>
@@ -319,14 +323,14 @@
        <el-row>
          <el-col :span="12">
            <el-form-item :label-width="formLabelWidth" label="设备名称">
              <el-input v-model="getBasicData.deviceName" autocomplete="off" style="width: 220px"/>
              <el-input v-model="getBasicData.device_name" autocomplete="off" style="width: 220px"/>
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item :label-width="formLabelWidth" label="类型">
              <el-select v-model="form.region" placeholder="维修" style="width: 220px">
                <el-option label="保养" value="shanghai"/>
                <el-option label="维修" value="mobian"/>
              <el-select v-model="getBasicData.type" placeholder="维修" style="width: 220px">
                <el-option label="保养" value="1"/>
                <el-option label="维修" value="2"/>
              </el-select>
            </el-form-item>
          </el-col>
@@ -335,16 +339,17 @@
          <el-col :span="12">
            <el-form-item :label-width="formLabelWidth" label="故障日期">
              <el-date-picker
                  v-model="getBasicData.faultTime"
                  v-model="getBasicData.fault_time"
                  :size="size"
                  placeholder="2023-01-01"
                  type="date"
                  format="YYYY/MM/DD"
                  value-format="YYYY-MM-DD"
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item :label-width="formLabelWidth" label="故障原因">
              <el-input v-model="getBasicData.faultReason" autocomplete="off" style="width: 220px"/>
              <el-input v-model="getBasicData.fault_reason" autocomplete="off" style="width: 220px"/>
            </el-form-item>
          </el-col>
        </el-row>
@@ -352,16 +357,17 @@
          <el-col :span="12">
            <el-form-item :label-width="formLabelWidth" label="保养日期">
              <el-date-picker
                  v-model="getBasicData.maintenanceTime"
                  v-model="getBasicData.maintenance_time"
                  :size="size"
                  placeholder="2023-02-01"
                  type="date"
                  format="YYYY/MM/DD"
                  value-format="YYYY-MM-DD"
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item :label-width="formLabelWidth" label="保养说明">
              <el-input v-model="getBasicData.maintenanceIllustrate" autocomplete="off" style="width: 220px"/>
              <el-input v-model="getBasicData.maintenance_illustrate" autocomplete="off" style="width: 220px"/>
            </el-form-item>
          </el-col>
        </el-row>
@@ -369,20 +375,21 @@
          <el-col :span="12">
            <el-form-item :label-width="formLabelWidth" label="保养/维修开始时间">
              <el-date-picker
                  v-model="getBasicData.startTime"
                  :size="size"
                  placeholder="2023-02-01"
                  v-model="getBasicData.start_time"
                  type="date"
                  format="YYYY/MM/DD"
                  value-format="YYYY-MM-DD"
              />
            </el-form-item>
          </el-col>
          <el-col :span="12">
            <el-form-item :label-width="formLabelWidth" label="保养/维修完成时间">
              <el-date-picker
                  v-model="getBasicData.stopTime"
                  v-model="getBasicData.stop_time"
                  :size="size"
                  placeholder="2023-02-01"
                  type="date"
                  format="YYYY/MM/DD"
                  value-format="YYYY-MM-DD"
              />
            </el-form-item>
          </el-col>

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

@@ -64,9 +64,7 @@
          ElMessage.success(t('workOrder.deleteOk'))
          router.push({path: '/main/processCard/SelectProcessCard', query: {random:Math.random()}})
        } else {

          ElMessage.warning('删除失败，检查流程卡是否已报工')

        }
      })


 north-glass-erp/northglass-erp/src/views/pp/workOrder/AddWorkOrder.vue

@@ -222,13 +222,11 @@
            })

            request.post("/workOrder/addOrderWork", workOrderData.value).then((res) => {
              if (res.code == 200) {
              if (res.code == 200 && res.data===true) {
                ElMessage.success(t('basicData.msg.saveSuccess'))
                //location.reload();
                router.push({path: '/main/workOrder/addWorkOrder', query: {orderId:id,random:Math.random()}})
              } else {
                ElMessage.warning(res.msg)
               // router.push("/login")
              }
            })


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

@@ -86,4 +86,12 @@
        return Result.seccess(deviceMaintenanceService.openSelectIdSv(id));

    }

    @ApiOperation("设备保养维修修改接口")
    @PostMapping("/updateMaintenance")
    public Result deleteOrderWork(
            @RequestBody Map<String,Object> object
    ){
        return  Result.seccess(deviceMaintenanceService.updateMaintenance(object));
    }
}

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

@@ -51,12 +51,14 @@
    @PostMapping("/addOrderWork")
    public Result addOrderWork( @RequestBody Map<String,Object>  object){

        if(workOrderService.addOrderWorkSv(object)){
            return Result.seccess();
        }else {
            throw new ServiceException(Constants.Code_500,"保存失败");
//        if(workOrderService.addOrderWorkSv(object)){
//            return Result.seccess();
//        }else {
//            throw new ServiceException(Constants.Code_500,"保存失败");
//
//        }

        }
        return  Result.seccess(workOrderService.addOrderWorkSv(object));
    }

    //删除工单

 north-glass-erp/src/main/java/com/example/erp/controller/sd/OrderController.java

@@ -3,6 +3,7 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.entity.sd.Order;
import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.entity.sd.OrderGlassDetail;
@@ -11,13 +12,11 @@
import com.example.erp.tools.DownExcel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
import java.util.Map;

@@ -121,6 +120,6 @@
    public void exportOrderReport(HttpServletResponse response, @RequestBody List<LocalDate> dates) throws IOException, IllegalAccessException, InstantiationException {

        //参数：相应的数据，实体类信息，相应的方法（数据获取），生成的excel名字
        DownExcel.download(response,Order.class, orderService.exportOrderReport(dates),"orderReport");
        DownExcel.download(response, OrderDTO.class, orderService.exportOrderReport(dates),"orderReport");
    }
}

 north-glass-erp/src/main/java/com/example/erp/dto/sd/OrderDTO.java

New file
@@ -0,0 +1,29 @@
package com.example.erp.dto.sd;

import com.baomidou.mybatisplus.annotation.TableField;
import com.example.erp.entity.sd.Order;
import lombok.Data;
import lombok.EqualsAndHashCode;

@EqualsAndHashCode(callSuper = true)
@Data
public class OrderDTO extends Order {
    private Integer productId;
    private String productName;
    private Integer orderNumber;
    private Double width;
    private Double height;
    private Long quantity;
    private Integer bendRadius;
    private Double grossArea;
    private Double computeGrossArea;
    private String shape;
    private String edgingType;
    private String remarks;
    private Double perimeter;
    private Double price;
    private Long grossAmount;
    private String levelOne;
    private String levelTwo;
    private String totalThickness;
}

 north-glass-erp/src/main/java/com/example/erp/entity/sd/Order.java

@@ -44,7 +44,7 @@
    private String otherRemarks;
    private Double area;
    private Long quantity;
    private String perimeter;
    private Double perimeter;
    private String verifierId;
    private String verifier;
    private String creatorId;

 north-glass-erp/src/main/java/com/example/erp/entity/sd/OrderDetail.java

@@ -1,5 +1,6 @@
package com.example.erp.entity.sd;

import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;

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

@@ -32,4 +32,6 @@
    List<DeviceMaintenance> selectMachineMp();

    List<Map<String,String>> openSelectIdMp(String id);

    Boolean updateMaintenanceMp(Integer id, String deviceName, String type, LocalDateTime faultTime, String faultReason, LocalDateTime maintenanceTime, String maintenanceIllustrate, LocalDateTime stopTime, LocalDateTime startTime, String process, String personnel, String cost);
}

 north-glass-erp/src/main/java/com/example/erp/mapper/sd/OrderDetailMapper.java

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

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.sd.Order;
import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.entity.sd.OrderDetail;
import org.apache.ibatis.annotations.Mapper;

@@ -21,7 +21,7 @@
    //type为了区别需不需要根据产品分类
    Map<String,Integer> getOrderReportTotal(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail, String type);

    List<Order> exportOrderReport(List<LocalDate> dates);
    List<OrderDTO> exportOrderReport(List<LocalDate> dates);

    List<OrderDetail> getOrderProductSummary(Integer offset, Integer pageSize, String startDate, String endDate, OrderDetail orderDetail);


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

@@ -5,6 +5,7 @@
import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.pp.BasicDataProduce;
import com.example.erp.entity.pp.DeviceMaintenance;
import com.example.erp.entity.pp.ReportingWork;
import com.example.erp.mapper.pp.DeviceMaintenanceMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -91,4 +92,21 @@
        map.put("data", deviceMaintenanceMapper.openSelectIdMp(id));
        return map;
    }

    public Boolean updateMaintenance(Map<String, Object> object) {
        JSONObject dataJson = new JSONObject(object);
        DeviceMaintenance deviceMaintenance = JSONObject.parseObject(JSONObject.toJSONString(dataJson.get("machine")), DeviceMaintenance.class);
        if (!dataJson.isEmpty()) {
                deviceMaintenanceMapper.updateMaintenanceMp(deviceMaintenance.getId(),deviceMaintenance.getDeviceName(),
                        deviceMaintenance.getType(),deviceMaintenance.getFaultTime(),deviceMaintenance.getFaultReason(),
                        deviceMaintenance.getMaintenanceTime(),deviceMaintenance.getMaintenanceIllustrate(),
                        deviceMaintenance.getStopTime(),deviceMaintenance.getStartTime(),deviceMaintenance.getProcess(),
                        deviceMaintenance.getPersonnel(),
                        deviceMaintenance.getCost()
                );
            return true;
        } else {
            return false;
        }
    }
}

 north-glass-erp/src/main/java/com/example/erp/service/sd/OrderService.java

@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.example.erp.common.Constants;
import com.example.erp.dto.sd.OrderDTO;
import com.example.erp.entity.sd.*;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.exception.ServiceException;
@@ -311,7 +312,7 @@
        return map;
    }

    public List<Order> exportOrderReport(List<LocalDate> dates) {
    public List<OrderDTO> exportOrderReport(List<LocalDate> dates) {
        return orderDetailMapper.exportOrderReport(dates);
    }


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

@@ -63,7 +63,21 @@
    </insert>

    <select id="selectMaintenanceMp" resultMap="DeviceMaintenanceMapper">
        select * from device_maintenance where DATE_FORMAT((create_time),'%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
        select id,
               device_id,
               device_name,
               type,
               date(fault_time) as fault_time,
               fault_reason,
               date(maintenance_time) as maintenance_time,
               maintenance_illustrate,
               date(start_time) as start_time,
               date(stop_time) as stop_time,
               process,
               personnel,
               cost
        from device_maintenance
        where DATE_FORMAT((create_time), '%Y-%m-%d') BETWEEN #{ selectTime1 } AND #{ selectTime2 }
    </select>

    <delete id="deleteMaintenanceMp">
@@ -86,6 +100,34 @@
    </select>

    <select id="openSelectIdMp">
    select * from device_maintenance where id = #{id}
    select id,
           device_id,
           device_name,
           type,
           date(fault_time) as fault_time,
           fault_reason,
           date(maintenance_time) as maintenance_time,
           maintenance_illustrate,
           date(start_time) as start_time,
           date(stop_time) as stop_time,
           process,
           personnel,
           cost from device_maintenance where id = #{id}
    </select>

    <update id="updateMaintenanceMp">
        update device_maintenance set
        device_name = #{deviceName},
        type = #{type},
        fault_time = #{faultTime},
        fault_reason = #{faultReason},
        maintenance_time = #{maintenanceTime},
        maintenance_illustrate = #{maintenanceIllustrate},
        start_time = #{startTime},
        stop_time = #{stopTime},
        process = #{process},
        personnel = #{personnel},
        cost = #{cost}
        where id = #{id}
    </update>
</mapper>

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

@@ -392,12 +392,12 @@
        </if>
    </select>

    <select id="exportOrderReport">
    <select id="exportOrderReport"  >
        SELECT
            *,
            a.create_time as createTime,
            d.type_name as levelOne,
            e.type_name as levelTwo
            d.type_name as level_one,
            e.type_name as level_two
        from order_detail as a
         left join sd.`order` as b
                   on b.order_id = a.order_id
@@ -408,7 +408,6 @@
         left join sd.basic_glass_type as e
                   on e.type_id = d.belong
        where  date(a.create_time)>=#{dates[0]} and date(a.create_time) &lt;= #{dates[1]}

    </select>