Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

chenlu

2024-04-23 9752367ec1f8b3ed8debec00654b072f38d1452c

Merge branch 'master' of https://gitee.com/a1536384743/erp_-override

# Conflicts:
#	north-glass-erp/northglass-erp/config.js

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

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

 north-glass-erp/northglass-erp/src/views/pp/Replenish/AddReplenish.vue

@@ -100,8 +100,8 @@
    {field: 'productName', width: 120, title: t('order.product'),filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'reportingWorkId', width: 120, title: t('reportingWorks.reportingWorkId'), filters: [{data: ''}], slots: {filter: 'num1_filter'},filterMethod:filterChanged},
    {field: 'technologyNumber', width: 80, title: t('replenish.mark'),filters:[{ data: '' }],slots: { filter: 'num1_filter' }, showOverflow: "ellipsis",filterMethod:filterChanged},
    {field: 'glassAddress', width: 90, title: t('replenish.mark'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'patchNum', width: 120, title: t('replenish.sliceMarking'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'glassAddress', width: 90, title: t('replenish.sliceMarking'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'patchNum', width: 120, title: t('order.quantity'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'width', width: 80, title: t('order.width'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'height', width: 80, title: t('order.height'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},
    {field: 'shape', width: 80, title: t('order.shape'), sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod:filterChanged},

 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>