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

chenlu

2024-05-13 d35d14bc183e7275e79cb64537ce28dc83f271f0

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

 north-glass-erp/northglass-erp/src/views/mm/basicData/WarehouseBasicData.vue

@@ -21,6 +21,7 @@
    <div id="div-title">
      <el-breadcrumb :separator-icon="ArrowRight">
        <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/warehouseBasicData/warehouseSearchBasicData' }">基础数据</el-breadcrumb-item>
        <el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">{{$t('productStock.reportForms')}}</el-breadcrumb-item>
      </el-breadcrumb>
    </div>


 north-glass-erp/northglass-erp/src/views/mm/stockReport/StockReport.vue

@@ -33,6 +33,7 @@
                              :to="{path:'/main/stockReport/SubsidiaryMonthReport'}">
            辅料月结报表
          </el-breadcrumb-item>-->
          <el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">{{$t('productStock.reportForms')}}</el-breadcrumb-item>
        </el-breadcrumb>
    </div>


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

@@ -27,7 +27,7 @@
        <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/Replenish/SelectReplenish' }">{{$t('replenish.patchManagement')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/Replenish/AddReplenish' }">{{$t('replenish.addPatches')}}</el-breadcrumb-item>
<!--        <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/Replenish/PrintReplenishFlowCard' }">{{$t('replenish.printPatches')}}</el-breadcrumb-item>-->

        <el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">{{$t('productStock.reportForms')}}</el-breadcrumb-item>
      </el-breadcrumb>
    </div>


 north-glass-erp/northglass-erp/src/views/pp/rework/Rework.vue

@@ -26,6 +26,7 @@
        <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/rework/SelectRework' }">{{$t('rework.reworkManagement')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/rework/AddRework' }">{{$t('rework.addRework')}}</el-breadcrumb-item>
        <el-breadcrumb-item :to="{ path: '/main/processCard/SelectPrintFlowCard' }" style="display: none">{{$t('rework.printRework')}}</el-breadcrumb-item>
        <el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">{{$t('productStock.reportForms')}}</el-breadcrumb-item>
      </el-breadcrumb>
    </div>


 north-glass-erp/northglass-erp/src/views/sd/customer/Customer.vue

@@ -18,7 +18,7 @@
      <el-breadcrumb :separator-icon="ArrowRight">
        <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/customer/selectCustomer' }">{{ $t('customer.customerHomePage') }}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/customer/CreateCustomer' }">{{ $t('customer.increaseCustomers') }}</el-breadcrumb-item>

        <el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">{{$t('productStock.reportForms')}}</el-breadcrumb-item>
      </el-breadcrumb>
    </div>


 north-glass-erp/northglass-erp/src/views/sd/delivery/Delivery.vue

@@ -21,7 +21,7 @@
        <el-breadcrumb-item @click="changeRouter(1)" :class="indexFlag===1?'indexTag':''" :to="{ path: '/main/delivery/selectDelivery' }">{{$t('delivery.shippingHomepage')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(2)" :class="indexFlag===2?'indexTag':''" :to="{ path: '/main/delivery/selectOrderList' }">{{$t('delivery.orderShipment')}}</el-breadcrumb-item>
        <el-breadcrumb-item @click="changeRouter(3)" :class="indexFlag===3?'indexTag':''" :to="{ path: '/main/delivery/deliveryReport' }">{{$t('productStock.reportForms')}}</el-breadcrumb-item>

        <el-breadcrumb-item v-show="false" :to="{ path: '/main/order/orderReport' }">{{$t('productStock.reportForms')}}</el-breadcrumb-item>
      </el-breadcrumb>
    </div>


 north-glass-erp/northglass-erp/src/views/system/role/RoleList.vue

@@ -148,13 +148,16 @@
  }
  for (let columnNameKey in columnNameP) {
    let column = {field: columnNameKey,
      title: columnNameP[columnNameKey]
      title: columnNameP[columnNameKey],
      filterMethod:filterChanged1
    }
    columnsP.push(column)
  }
  permissionOptions.columns = columnsP

})



onMounted(()=>{
  request.get(`/role/findAll`).then(res=>{
@@ -181,16 +184,32 @@
  })
}

const filterChanged1 = ({ option, row }) => {
  return row.page === option.data
}

const selectChange = () => {
  getPermissionList()
  if(selectValue.value===null){
    pGrid.value.clearFilter()
    return
  }

  const column = pGrid.value.getColumnByField('page')
  column.filters =[{ data: '' }]
  const option = column.filters[0]
  option.data = selectValue.value[1]
  option.checked = true
  // 如果是直接修复筛选条件，则需要手动调用 updateData 处理表格数据
  pGrid.value.updateData()
  //getPermissionList()
}

const saveBatch = () => {
  const $grid = pGrid.value
  if($grid.getCheckboxRecords().length === 0){
    ElMessage.warning("请先选择权限")
    return
  }
  // if($grid.getCheckboxRecords().length === 0){
  //   ElMessage.warning("请先选择权限")
  //   return
  // }
  ElMessageBox.confirm(
      '确认修改角色权限?',
      'Warning',
@@ -286,6 +305,7 @@
              v-model="selectValue"
              :options="options"
              @change="selectChange"
              clearable
          />
        </template>
        <template #save_buttons>
@@ -293,7 +313,7 @@
              @click="saveBatch"
              status='primary'
              style="margin-right: 1rem"
          >新增</vxe-button>
          >保存</vxe-button>
        </template>

      </vxe-grid>

 north-glass-erp/src/main/java/com/example/erp/mapper/mm/MaterialInventoryMapper.java

@@ -35,17 +35,17 @@

    List<Map<String,Object>> getSelectMaterialInventory(@Param("offset") Integer offset,
                                                       @Param("pageSize") Integer pageSize,
                                                       @Param("materialInventory") MaterialInventory materialInventory);
                                                       @Param("materialInventory") MaterialInventory materialInventory, @Param("ids") List<Long> ids);


    Map<String,Integer> getSelectMaterialInventoryPageTotal(Integer offset, Integer pageSize, MaterialInventory materialInventory);
    Map<String,Integer> getSelectMaterialInventoryPageTotal(Integer offset, Integer pageSize, MaterialInventory materialInventory, @Param("ids") List<Long> ids);

    List<Map<String,Object>> getSelectMaterialInventoryEngineering(@Param("offset") Integer offset,
                                                        @Param("pageSize") Integer pageSize,
                                                        @Param("optimizeUse") OptimizeUse optimizeUse);
                                                        @Param("optimizeUse") OptimizeUse optimizeUse, @Param("ids") List<Long> ids);


    Map<String,Integer> getSelectMaterialInventoryEngineeringPageTotal(Integer offset, Integer pageSize, OptimizeUse optimizeUse);
    Map<String,Integer> getSelectMaterialInventoryEngineeringPageTotal(Integer offset, Integer pageSize, OptimizeUse optimizeUse, @Param("ids") List<Long> ids);

    Boolean insertMaterialStore(@Param("type") String type,
                                         @Param("json") String json);

 north-glass-erp/src/main/java/com/example/erp/service/mm/MaterialInventoryService.java

@@ -1,5 +1,6 @@
package com.example.erp.service.mm;

import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
@@ -17,11 +18,14 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.List;
import java.util.ArrayList;

import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;

@Service
@DS("mm")
@@ -191,16 +195,26 @@
        Integer offset = (pageNum - 1) * pageSize;

        Map<String, Object> map = new HashMap<>();
        map.put("data", materialInventoryMapper.getSelectMaterialInventory(offset, pageSize, materialInventory));
        map.put("total", materialInventoryMapper.getSelectMaterialInventoryPageTotal(offset, pageSize, materialInventory));
        List<Long> ids=new ArrayList<>();;
        if(materialInventory.getStockId()!=null && !materialInventory.getStockId().isEmpty()){
            List<String> result = StrUtil.split(materialInventory.getStockId(), '|');
            ids=result.stream().map(Long::valueOf).collect(Collectors.toList());
        }
        map.put("data", materialInventoryMapper.getSelectMaterialInventory(offset, pageSize, materialInventory,ids));
        map.put("total", materialInventoryMapper.getSelectMaterialInventoryPageTotal(offset, pageSize, materialInventory,ids));
        return map;
    }

    public Map<String, Object> getSelectMaterialInventoryEngineering(Integer pageNum, Integer pageSize, OptimizeUse optimizeUse) {
        Integer offset = (pageNum - 1) * pageSize;
        Map<String, Object> map = new HashMap<>();
        map.put("data", materialInventoryMapper.getSelectMaterialInventoryEngineering(offset, pageSize, optimizeUse));
        map.put("total", materialInventoryMapper.getSelectMaterialInventoryEngineeringPageTotal(offset, pageSize, optimizeUse));
        List<Long> ids=new ArrayList<>();;
        if(optimizeUse.getRawStockCode()!=null && !optimizeUse.getRawStockCode().isEmpty()){
            List<String> result = StrUtil.split(optimizeUse.getRawStockCode(), '|');
            ids=result.stream().map(Long::valueOf).collect(Collectors.toList());
        }
        map.put("data", materialInventoryMapper.getSelectMaterialInventoryEngineering(offset, pageSize, optimizeUse,ids));
        map.put("total", materialInventoryMapper.getSelectMaterialInventoryEngineeringPageTotal(offset, pageSize, optimizeUse,ids));
        return map;
    }


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

@@ -26,7 +26,6 @@
        List<Map<String,Object>> ListOne = new ArrayList<>();

        for(PermissionBasic permissionBasic : getOne){
            System.out.println(permissionBasic.getMenu());
            Map<String,Object> map = new HashMap<>();
            map.put("value",permissionBasic.getId());
            map.put("label",permissionBasic.getMenu());

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

@@ -41,11 +41,10 @@
                        JSONObject.toJSONString(permissionRoleJson.get("detail")),
                        PermissionBasic.class);
        Integer roleId = (Integer) permissionRoleMap.get("id");
        permissionRoleMapper.delete(new QueryWrapper<PermissionRole>().eq("role_id", roleId));
        if(permissionBasics.isEmpty() || roleId == null ){
            return false;
            return true;
        }


        List<PermissionRole> permissionRoles = new ArrayList<>();
        for (PermissionBasic permissionBasic : permissionBasics) {
            PermissionRole permissionRole = new PermissionRole();
@@ -53,7 +52,7 @@
            permissionRole.setPermissionId(permissionBasic.getId());
            permissionRoles.add(permissionRole);
        }
        permissionRoleMapper.delete(new QueryWrapper<PermissionRole>().eq("role_id", roleId));

        return permissionRoleMapper.saveBatch(permissionRoles);



 north-glass-erp/src/main/resources/application.yml

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

 north-glass-erp/src/main/resources/mapper/mm/MaterialInventory.xml

@@ -82,7 +82,7 @@
        select
        ou.id as useId,
        ou.project_no as projectNo,
        ou.use_count AS inventoryQuantity,
        mi.inventory_quantity AS inventoryQuantity,
        mi.plan_quantity AS availableQuantity,
        mi.plan_quantity AS planQuantity,
        mi.id,
@@ -98,9 +98,10 @@
        mi.dead_stock AS deadStock,
        mi.remarks,
        date(mi.create_time) AS createTime,
        ms.json from pp.optimize_use ou left join mm.material_inventory mi on ou.stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
        ms.json from pp.optimize_use ou left join mm.material_inventory mi on ou.raw_stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
        left join pp.optimize_project op on op.project_no=ou.project_no
        <where>
            ou.not_use_count>0 and ou.state=1 and
            mi.plan_quantity>0 and op.state>=100 and
            date(ou.create_time)>=#{startDate} and date(ou.create_time) &lt;= #{endDate}

        </where>
@@ -144,7 +145,10 @@
        from mm.material_inventory mi left join mm.material_store ms on mi.material_code=ms.id
        <where>
            <if test="materialInventory.stockId != null and materialInventory.stockId != ''">
                and mi.id regexp #{materialInventory.stockId}
                and mi.id in
                <foreach item="id" collection="ids" open="(" separator="," close=")">
                    #{id}
                </foreach>
            </if>

        </where>
@@ -171,7 +175,7 @@
        select
        ou.id as useId,
        ou.project_no as projectNo,
        ou.use_count AS inventoryQuantity,
        mi.inventory_quantity AS inventoryQuantity,
        mi.plan_quantity AS availableQuantity,
        mi.plan_quantity AS planQuantity,
        mi.id,
@@ -187,11 +191,14 @@
        mi.dead_stock AS deadStock,
        mi.remarks,
        date(mi.create_time) AS createTime,
        ms.json from pp.optimize_use ou left join mm.material_inventory mi on ou.stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id
        ms.json from pp.optimize_use ou left join mm.material_inventory mi on ou.raw_stock_code=mi.id left join mm.material_store ms on mi.material_code=ms.id

        <where>
            <if test="optimizeUse.rawStockCode != null and optimizeUse.rawStockCode != ''">
                and ou.id regexp #{optimizeUse.rawStockCode}
                and ou.id in
                <foreach item="id" collection="ids" open="(" separator="," close=")">
                    #{id}
                </foreach>
            </if>

        </where>
@@ -207,7 +214,10 @@
        pp.optimize_use ou
        <where>
            <if test="optimizeUse.rawStockCode != null and optimizeUse.rawStockCode != ''">
                and ou.id regexp #{optimizeUse.rawStockCode}
                and ou.id in
                <foreach item="id" collection="ids" open="(" separator="," close=")">
                    #{id}
                </foreach>
            </if>

        </where>

 north-glass-erp/src/main/resources/mapper/userInfo/PermissionBasicMapper.xml

@@ -49,7 +49,7 @@

    <select id="selectTowLevel">
        select
            id as value,
            page as value,
            page as label
        from permission_basic
        where

 north-glass-erp/target/classes/application.yml

File was deleted

 north-glass-erp/target/classes/mapper/mm/BasicWarehouseType.xml

File was deleted

 north-glass-erp/target/classes/mapper/mm/FinishedGoodsInventory.xml

File was deleted

 north-glass-erp/target/classes/mapper/mm/FinishedOperateLog.xml

File was deleted

 north-glass-erp/target/classes/mapper/mm/MaterialInventory.xml

File was deleted

 north-glass-erp/target/classes/mapper/mm/MaterialStore.xml

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

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

File was deleted

 north-glass-erp/target/classes/mapper/sd/BasicDataMapper.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/BasicGlassTypeMapper.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/BasicOtherMoneyMapper.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/CustomerMapper.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/DeliveryDetailMapper.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/DeliveryMapper.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/DeliveryOtherMoneyMapper.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/OrderDetailMapper.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/OrderGlassDetailMapper.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/OrderMapper.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/OrderOtherMoneyMapper.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/OrderProcessDetailMapper.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/ProductDetailMapper.xml

File was deleted

 north-glass-erp/target/classes/mapper/sd/ProductMapper.xml

File was deleted

 north-glass-erp/target/classes/mapper/userInfo/PermissionRoleMapper.xml

File was deleted

 north-glass-erp/target/classes/mapper/userInfo/SysError.xml

File was deleted

 north-glass-erp/target/classes/mapper/userInfo/SysMenu.xml

File was deleted

 north-glass-erp/target/classes/mapper/userInfo/SysMenuItem.xml

File was deleted

 north-glass-erp/target/classes/mapper/userInfo/User.xml

File was deleted

 north-glass-erp/target/erp-0.0.1-SNAPSHOT.jar.original

Binary files differ

 north-glass-erp/target/maven-archiver/pom.properties

File was deleted

 north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

File was deleted

 north-glass-erp/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

File was deleted

 north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst

File was deleted

 north-glass-erp/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

File was deleted