修改

廖井涛

2024-04-23 90f8b0be55130db143270ac57c6c819a8241b599

修改

 north-glass-erp/northglass-erp/config.js

@@ -1,4 +1,4 @@
export default {
  serverUrl:"localhost:8086"
  //serverUrl:"10.153.19.150:8086"
  //serverUrl:"10.153.19.150:8080"
}

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

@@ -46,6 +46,7 @@
        for (Map<String, Object> item:ReworkMap){
            item.put("reworkTeam","");
            List<BasicDataProduce> basicCategory=new ArrayList<>();

            List<BasicDataProduce> basicDataProduceList=basicDateProduceMapper.SelectWorkBasicTeams(item.get("reworkProcesses").toString());
            for (BasicDataProduce basicDataProduce:basicDataProduceList){
                if(Objects.equals(basicDataProduce.getBasicData().getBasicName(),item.get("reworkProcesses"))){

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

@@ -13,9 +13,7 @@
        <result column="d_basic_type" property="basicData.basicType"/>
        <result column="d_basic_name" property="basicData.basicName"/>
        <result column="d_basic_category" property="basicData.basicCategory"/>
        <association property="basicData" javaType="com.example.erp.entity.sd.BasicData">
            <result column="basic_name" property="basicName"/>
        </association>



    </resultMap>

 north-glass-erp/target/classes/mapper/pp/BasicDataProduce.xml

@@ -13,9 +13,7 @@
        <result column="d_basic_type" property="basicData.basicType"/>
        <result column="d_basic_name" property="basicData.basicName"/>
        <result column="d_basic_category" property="basicData.basicCategory"/>
        <association property="basicData" javaType="com.example.erp.entity.sd.BasicData">
            <result column="basic_name" property="basicName"/>
        </association>



    </resultMap>