义乌上片功能（部分）

wangfei

2024-10-31 8bd3fa89541cdf63ed4e9c932c5336621ba58ed3

义乌上片功能（部分）

 UI-Project/src/views/Returns/upreturns.vue

@@ -85,7 +85,7 @@
});
const selectgong = async () => {
  try {
    const response = await request.post('/loadGlass/upEngineering/selectTask')
    const response = await request.post('/loadGlass/engineering/engineering/selectTask')
    if (response.code == 200) {
      titleSelectJson.value.engineerId = response.data;
    } else {

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/EngineeringService.java

@@ -26,17 +26,29 @@
     * @return List<Engineering>
     */
    List<Engineering> selectEngineering(String engineeringId);

    /**
     * 保存钢化信息
     */
    void saveEngineering(List<Engineering> engineering);

    /**
     * 查询是否有上片任务
     *
     * @return Engineering
     */
    Engineering selectInitiate(Integer state);

    /**
     * 查询是否有上片任务yw
     *
     * @return Engineering
     */
    Engineering selectUpInitiate(Integer state, Integer equipmentId);

    /**
     * 查询上片任务
     *
     * @return Engineering
     */
    List<Engineering> selectTask();

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/engineering/service/impl/EngineeringServiceImpl.java

@@ -95,14 +95,19 @@
    }

    @Override
    public  Engineering selectInitiate(Integer state) {
    public Engineering selectInitiate(Integer state) {
        //查询是否有开始上片的工程任务
        QueryWrapper<Engineering> wrapper = new QueryWrapper<>();
            wrapper.eq("state", state);
        wrapper.eq("state", state);
        return engineeringMapper.selectOne(wrapper);
    }

    @Override
    public Engineering selectUpInitiate(Integer state, Integer equipmentId) {
        return null;
    }

    @Override
    public List<Engineering> selectTask() {
        //查询可开始任务的工程
        QueryWrapper<Engineering> wrapper = new QueryWrapper<>();

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcUpLoadGlassTask.java

File was deleted

 hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@
      strict: false #设置严格模式,默认false不启动. 启动后在未匹配到指定数据源时候回抛出异常,不启动会使用默认数据源.
      datasource:
        hangzhoumes:
          url: jdbc:mysql://127.0.0.1:3306/hangzhoumes?serverTimezone=GMT%2b8
          url: jdbc:mysql://10.153.19.150:3306/hangzhoumes?serverTimezone=GMT%2b8
          username: root
          password: beibo.123/
          driver-class-name: com.mysql.cj.jdbc.Driver