提交重置

guoyujie

2025-03-14 557a9d5426c365e9ff2c553518ce10916aa16156

提交重置

 north-glass-erp/northglass-erp/src/router/index.js

@@ -1215,6 +1215,11 @@
      path: '/register',
      name: 'register',
      component: () => import('../views/RegisterView.vue')
    },
    {
      path: '/appDownLoad',
      name: 'appDownLoad',
      component: () => import('../views/system/app/appDownload.vue')
    }
    
  ]

 north-glass-erp/northglass-erp/src/views/system/app/appDownload.vue

New file
@@ -0,0 +1,14 @@
<script setup>

</script>

<template>
  <div style="width: 100vw;height: 100vh;padding-top: 40vh;text-align: center;">
    <el-link  href="/NorthGlass.apk" type="primary">北玻手机扫码APP下载</el-link>
  </div>

</template>

<style scoped>

</style>

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

@@ -252,5 +252,11 @@
        return  Result.seccess(orderService.processBack(orderId,status));
    }

    @ApiOperation("手机扫码玻璃信息")
    @PostMapping("/scannerGlassInfo/{projectNo}")
    public Result scannerGlassInfo(@PathVariable String projectNo)  {
        return  Result.seccess(orderService.scannerGlassInfo(projectNo));
    }


}

 north-glass-erp/src/main/java/com/example/erp/controller/userInfo/AppVersionController.java

New file
@@ -0,0 +1,24 @@
package com.example.erp.controller.userInfo;

import com.example.erp.common.Result;
import com.example.erp.service.userInfo.AppVersionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/appVersion")
public class AppVersionController {
    private final AppVersionService appVersionService;

    public AppVersionController(AppVersionService appVersionService) {
        this.appVersionService = appVersionService;
    }


    @PostMapping("searchVersion")
    public Result searchVersion(){
        return Result.seccess(appVersionService.searchVersion());
    }
}

 north-glass-erp/src/main/java/com/example/erp/entity/userInfo/AppVersion.java

New file
@@ -0,0 +1,10 @@
package com.example.erp.entity.userInfo;

import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;

@Data
public class AppVersion {
    private Long id;
    private String version;
}

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

@@ -241,4 +241,6 @@
    List<Map<String, Object>> getPrintOrderDataDetails(String orderId, Integer orderNumber, Integer printQuantity);

    Boolean updatePrintNumberMp(String processId, Integer orderNumber);

    String getOrderIdByProcessId(String processId);
}

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

@@ -55,4 +55,8 @@

    //查询订单入库状态
    Integer searchOrderWarehousing( String orderId);

    Map<String,String> scannerGlassInfo(String projectNo, Integer layoutId, Integer sort, String orderId);

    String getProcessIdByOptimizeHeatDetail(String projectId, Integer layoutId, Integer sort);
}

 north-glass-erp/src/main/java/com/example/erp/mapper/userInfo/AppVersionMapper.java

New file
@@ -0,0 +1,9 @@
package com.example.erp.mapper.userInfo;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.example.erp.entity.userInfo.AppVersion;
import org.apache.ibatis.annotations.Mapper;

@Mapper
public interface AppVersionMapper extends BaseMapper<AppVersion> {
}

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

@@ -894,4 +894,13 @@
        log.setFunction("updateOrderMoney金额重置:"+orderId);
        return true;
    }

    public Object scannerGlassInfo(String projectNo) {
        String projectId = "p" + projectNo.substring(0,8);
        Integer heatNo = Integer.valueOf(projectNo.substring(8,11));
        Integer sortNo = Integer.valueOf(projectNo.substring(11,14));
        String processId = orderMapper.getProcessIdByOptimizeHeatDetail(projectId,heatNo,sortNo);
        String orderId = flowCardMapper.getOrderIdByProcessId(processId);
        return orderMapper.scannerGlassInfo(projectId,heatNo,sortNo,orderId);
    }
}

 north-glass-erp/src/main/java/com/example/erp/service/userInfo/AppVersionService.java

New file
@@ -0,0 +1,21 @@
package com.example.erp.service.userInfo;

import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.userInfo.AppVersion;
import com.example.erp.mapper.userInfo.AppVersionMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@Service
@DS("user_info")
public class AppVersionService {
    private final AppVersionMapper appVersionMapper;

    public AppVersionService(AppVersionMapper appVersionMapper) {
        this.appVersionMapper = appVersionMapper;
    }

    public AppVersion searchVersion() {
        return appVersionMapper.selectById(1);
    }
}

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

@@ -3056,4 +3056,8 @@
        where process_id = #{processId}
          and order_number = #{orderNumber}
    </select>

    <select id="getOrderIdByProcessId">
        select order_id from pp.flow_card  where process_id = #{processId} limit 1;
    </select>
</mapper>

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

@@ -348,7 +348,7 @@
        ifnull(if((d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)&lt; 0,
           0,
           (d.reporting_work_num_count+ifnull(c.reworkNumSum,0)-b.reporting_work_num_count-b.broken_num)
            ),0)
            ),0) as num
        from pp.flow_card as a
        left join sd.order_process_detail as b
        on

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

@@ -379,4 +379,36 @@
        select  warehousing from `order`
        where order_id = #{orderId}
    </select>

    <select id="getProcessIdByOptimizeHeatDetail">
        select  process_id from pp.optimize_heat_detail as a
        where a.project_no = #{projectId}
          and a.layout_id = #{layoutId}
          and a.sort = #{sort}
    </select>

    <select id="scannerGlassInfo">
        select c.order_id as orderId,
               b.order_number as orderNumber,
               b.technology_number as technologyNumber,
               a.process_id as processId,
               c.customer_name as customerName,
               concat(a.width," * " , a.height) as size,
               b.area,
               b.glass_child as glassChild,
               d.product_name as productName
        from pp.optimize_heat_detail as a
        left join sd.order_glass_detail as b
            on b.order_number = a.order_sort
            and b.technology_number = a. layer
            and b.order_id = #{orderId}
        left join  sd.order as c
            on c.order_id = b.order_id
        left join sd.order_detail as d
            on c.order_id = d.order_id
            and d.order_number = a.order_sort
        where a.project_no = #{projectNo}
        and a.layout_id = #{layoutId}
        and a.sort = #{sort}
    </select>
</mapper>

 north-glass-erp/src/test/java/com/example/erp/ErpApplicationTests.java

@@ -11,4 +11,9 @@
        String.valueOf("1.0").replaceAll("\\.0*$|(\\.\\d*?)0+$", "$1");
    }

    @Test
    void test() {

    }

}