廖井涛
2024-05-11 3fbc1ac0517b33088e4ff0b9b7822c390c689a9a
添加权限
10个文件已修改
15个文件已删除
6350 ■■■■■ 已修改文件
north-glass-erp/node_modules/.package-lock.json 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/node_modules/default-passive-events/LICENSE 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/node_modules/default-passive-events/README.md 118 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/node_modules/default-passive-events/dist/index.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/node_modules/default-passive-events/dist/index.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/node_modules/default-passive-events/dist/index.modern.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/node_modules/default-passive-events/dist/index.modern.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/node_modules/default-passive-events/dist/index.module.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/node_modules/default-passive-events/dist/index.module.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/node_modules/default-passive-events/dist/index.umd.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/node_modules/default-passive-events/dist/index.umd.js.map 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/node_modules/default-passive-events/package.json 45 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/node_modules/default-passive-events/src/index.js 46 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/node_modules/default-passive-events/src/utils.js 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/node_modules/default-passive-events/yarn.lock 6005 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/northglass-erp/src/views/system/user/UserList.vue 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/mm/BasicWarehouseTypeController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
north-glass-erp/node_modules/.package-lock.json
File was deleted
north-glass-erp/node_modules/default-passive-events/LICENSE
File was deleted
north-glass-erp/node_modules/default-passive-events/README.md
File was deleted
north-glass-erp/node_modules/default-passive-events/dist/index.js
File was deleted
north-glass-erp/node_modules/default-passive-events/dist/index.js.map
File was deleted
north-glass-erp/node_modules/default-passive-events/dist/index.modern.js
File was deleted
north-glass-erp/node_modules/default-passive-events/dist/index.modern.js.map
File was deleted
north-glass-erp/node_modules/default-passive-events/dist/index.module.js
File was deleted
north-glass-erp/node_modules/default-passive-events/dist/index.module.js.map
File was deleted
north-glass-erp/node_modules/default-passive-events/dist/index.umd.js
File was deleted
north-glass-erp/node_modules/default-passive-events/dist/index.umd.js.map
File was deleted
north-glass-erp/node_modules/default-passive-events/package.json
File was deleted
north-glass-erp/node_modules/default-passive-events/src/index.js
File was deleted
north-glass-erp/node_modules/default-passive-events/src/utils.js
File was deleted
north-glass-erp/node_modules/default-passive-events/yarn.lock
File was deleted
north-glass-erp/northglass-erp/src/views/mm/mainIngredientStock/ReturnToStorage.vue
@@ -281,7 +281,7 @@
      <!--左边固定显示的插槽-->
      <template #button_slot="{ row }">
        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">编辑</el-button>
        <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">删除</el-button>
<!--        <el-button @click="getTableRow(row,'delete')" link type="primary" size="small">删除</el-button>-->
      </template>
      <template #num1_filter="{ column, $panel }">
north-glass-erp/northglass-erp/src/views/system/user/UserList.vue
@@ -82,6 +82,7 @@
})
onMounted(()=>{
  request.get('/userInfo/findAll').then(res=>{
    console.log(res.data)
    let arr = res.data.users[0]
    arr.forEach(item=>{
      let bValues = item.userRoleList.map(item => item.role);
north-glass-erp/src/main/java/com/example/erp/controller/mm/BasicWarehouseTypeController.java
@@ -1,5 +1,6 @@
package com.example.erp.controller.mm;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Result;
import com.example.erp.entity.mm.BasicWarehouseType;
import com.example.erp.entity.sd.BasicData;
@@ -31,23 +32,27 @@
    }
    @ApiOperation("基础数据查询")
    @SaCheckPermission("warehouseSearchBasicData.search")
    @GetMapping("/getBasicWarehouse")
    public Result getBasicWarehouse(){
        return Result.seccess(basicWarehouseTypeService.getBasicWarehouse());
    }
    @ApiOperation("基础数据新增")
    @SaCheckPermission("warehouseSearchBasicData.add")
    @PostMapping("addBasicWarehouse")
    public Result addBasicWarehouse(@RequestBody Map<String,Object> map){
        return  Result.seccess(basicWarehouseTypeService.addBasicWarehouse(map));
    }
    @ApiOperation("基础数据修改")
    @SaCheckPermission("warehouseSearchBasicData.update")
    @PostMapping("updateBasicWarehouse")
    public Result updateBasicWarehouse(@RequestBody BasicWarehouseType basicWarehouseType){
        return  Result.seccess(basicWarehouseTypeService.updateBasicWarehouse(basicWarehouseType));
    }
    @ApiOperation("基础数据删除")
    @SaCheckPermission("warehouseSearchBasicData.delete")
    @PostMapping("deleteBasicWarehouse")
    public Result deleteBasicWarehouse(@RequestBody BasicWarehouseType basicWarehouseType){
        return  Result.seccess(basicWarehouseTypeService.deleteBasicWarehouse(basicWarehouseType));
north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java
@@ -2,6 +2,7 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.mm.FinishedOperateLog;
@@ -28,6 +29,7 @@
    /*成品库存查询*/
    @ApiOperation("成品库存查询接口")
    @SaCheckPermission("ProductStockList.search")
    @PostMapping("/getSelect/{pageNum}/{pageSize}")
    public Result defaultDateFinishedGoodsInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FinishedGoodsInventory finishedGoodsInventory){
        return Result.seccess(finishedGoodsInventoryService.defaultDateFinishedGoodsInventory(pageNum,pageSize,finishedGoodsInventory));
@@ -35,6 +37,7 @@
    /*查询可入库的成品数据*/
    @ApiOperation("可入库的成品查询接口")
    @SaCheckPermission("CreateProductStock.search")
    @PostMapping("/getSelectWarehousing/{pageNum}/{pageSize}")
    public Result getSelectWarehousing(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody FlowCard flowCard){
        return Result.seccess(finishedGoodsInventoryService.getSelectWarehousing(pageNum,pageSize,flowCard));
@@ -42,6 +45,7 @@
    /*成品入库*/
    @ApiOperation("成品入库接口")
    @SaCheckPermission("CreateProductStock.add")
    @PostMapping("/addSelectWarehousing")
    public Result addSelectWarehousing( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.addSelectWarehousing(object)){
@@ -54,6 +58,7 @@
    /*查询可发货的成品数据*/
    @ApiOperation("可发货的成品查询接口")
    @SaCheckPermission("FinishedProductOut.search")
    @PostMapping("/getSelectDeliveryDetail/{pageNum}/{pageSize}")
    public Result getSelectDeliveryDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        return Result.seccess(finishedGoodsInventoryService.getSelectDeliveryDetail(pageNum,pageSize,orderDetail));
@@ -61,6 +66,7 @@
    /*成品发货*/
    @ApiOperation("成品发货接口")
    @SaCheckPermission("FinishedProductOut.add")
    @PostMapping("/addDeliveryDetail")
    public Result addDeliveryDetail( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.addDeliveryDetail(object)){
@@ -73,6 +79,7 @@
    /* 调拨查询*/
    @ApiOperation("可调拨数据查询接口")
    @SaCheckPermission("OrderAllocation.search")
    @PostMapping("/getSelectAllocate/{pageNum}/{pageSize}")
    public Result getSelectAllocate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        return Result.seccess(finishedGoodsInventoryService.getSelectAllocate(pageNum,pageSize,orderDetail));
@@ -80,6 +87,7 @@
    /*订单调拨*/
    @ApiOperation("订单调拨接口")
    @SaCheckPermission("OrderAllocation.add")
    @PostMapping("/updateFinishedGoodsInventoryAllocate")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object>  object){
        if(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object)){
@@ -94,6 +102,7 @@
    /*调拨记录查询*/
    @ApiOperation("调拨记录查询接口")
    @SaCheckPermission("TransferRecord.search")
    @PostMapping("/getSelectAllocateFinishedOperateLog/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectAllocateFinishedOperateLog(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectAllocateFinishedOperateLog(pageNum,pageSize,selectDate,finishedOperateLog));
@@ -101,6 +110,7 @@
    /*订单领出*/
    @ApiOperation("订单领出接口")
    @SaCheckPermission("FinishedGoodsIssue.add")
    @PostMapping("/updateFinishedGoodsInventoryTakeOut")
    public Result updateFinishedGoodsInventoryTakeOut( @RequestBody Map<String,Object>  object){
@@ -115,6 +125,7 @@
    /*领出记录查询*/
    @ApiOperation("领出记录查询接口")
    @SaCheckPermission("TakeOutRecord.search")
    @PostMapping("/getSelectOperateRecord/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectOperateRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectOperateRecord(pageNum,pageSize,selectDate,finishedOperateLog));
@@ -138,6 +149,7 @@
    /*订单审核*/
    @ApiOperation("订单审核接口")
    @SaCheckPermission("TakeOutRecord.review")
    @PostMapping("/updateFinishedGoodsInventoryToExamine")
    public Result updateFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object>  object){
@@ -151,6 +163,7 @@
    }
    /*订单反审*/
    @ApiOperation("订单反审接口")
    @SaCheckPermission("TakeOutRecord.review")
    @PostMapping("/updateFinishedGoodsInventoryCounterExamination")
    public Result updateFinishedGoodsInventoryCounterExamination( @RequestBody Map<String,Object>  object){
@@ -165,6 +178,7 @@
    /*订单作废*/
    @ApiOperation("订单作废接口")
    @SaCheckPermission("TakeOutRecord.update")
    @PostMapping("/cancelFinishedGoodsInventoryToExamine")
    public Result cancelFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object>  object){
@@ -179,6 +193,7 @@
    /*出入库记录查询*/
    @ApiOperation("出入库记录查询接口")
    @SaCheckPermission("storageRecord.search")
    @PostMapping("/getSelectStorageRecord/{pageNum}/{pageSize}/{selectDate}/{type}")
    public Result getSelectStorageRecord(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@PathVariable String type, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectStorageRecord(pageNum,pageSize,selectDate,type,finishedOperateLog));
@@ -186,6 +201,7 @@
    /*出入库返回*/
    @ApiOperation("出入库返回接口")
    @SaCheckPermission("storageRecord.update")
    @PostMapping("/cancelFinishedGoodsInventoryStorage")
    public Result cancelFinishedGoodsInventoryStorage( @RequestBody Map<String,Object>  object){
@@ -199,6 +215,7 @@
    }
    @ApiOperation("成品库存记录查询接口")
    @SaCheckPermission("WarehouseReport.search")
    @PostMapping("/getSelectFinishedOperateLogReport/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectFinishedOperateLogReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody FinishedOperateLog finishedOperateLog){
        return Result.seccess(finishedGoodsInventoryService.getSelectFinishedOperateLogReport(pageNum,pageSize,selectDate,finishedOperateLog));
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java
@@ -1,6 +1,7 @@
package com.example.erp.controller.mm;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.mm.*;
@@ -24,6 +25,7 @@
    MaterialInventoryService materialInventoryService;
    @ApiOperation("物料出库新增接口")
    @SaCheckPermission("CreateOutbound.add")
    @PostMapping("/saveMaterialOutbound")
    public Result saveMaterialOutbound( @RequestBody Map<String,Object>  object){
        if(materialInventoryService.saveMaterialOutbound(object)){
@@ -35,6 +37,7 @@
    }
    @ApiOperation("物料新增接口")
    @SaCheckPermission("SelectIngredientsStock.add")
    @PostMapping("/saveMaterialInventory")
    public Result saveMaterialInventory( @RequestBody Map<String,Object>  object){
        if(materialInventoryService.saveMaterialInventory(object)){
@@ -46,36 +49,42 @@
    }
    @ApiOperation("物料库存加时间查询接口")
    @SaCheckPermission("SelectIngredientsStock.search")
    @PostMapping("/getSelectMaterialInventoryDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectMaterialInventoryDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialInventory materialInventory){
        return Result.seccess(materialInventoryService.getSelectMaterialInventoryDate(pageNum,pageSize,selectDate,materialInventory));
    }
    @ApiOperation("物料库存工程加时间查询接口")
    @SaCheckPermission("SelectIngredientsStock.search")
    @PostMapping("/getSelectMaterialInventoryEngineeringDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectMaterialInventoryEngineeringDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialInventory materialInventory){
        return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineeringDate(pageNum,pageSize,selectDate,materialInventory));
    }
    @ApiOperation("物料库存查询接口")
    @SaCheckPermission("CreateOutbound.search")
    @PostMapping("/getSelectMaterialInventory/{pageNum}/{pageSize}")
    public Result getSelectMaterialInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialInventory materialInventory){
        return Result.seccess(materialInventoryService.getSelectMaterialInventory(pageNum,pageSize,materialInventory));
    }
    @ApiOperation("物料库存工程查询接口")
    @SaCheckPermission("SelectIngredientsStock.search")
    @PostMapping("/getSelectMaterialInventoryEngineering/{pageNum}/{pageSize}")
    public Result getSelectMaterialInventoryEngineering(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OptimizeUse optimizeUse){
        return Result.seccess(materialInventoryService.getSelectMaterialInventoryEngineering(pageNum,pageSize,optimizeUse));
    }
    @ApiOperation("材料出库查询接口")
    @ApiOperation("材料出库加时间查询接口")
    @SaCheckPermission("MaterialOutbound.search")
    @PostMapping("/getSelectMaterialOutboundDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectMaterialOutboundDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody MaterialOutbound materialOutbound){
        return Result.seccess(materialInventoryService.getSelectMaterialOutboundDate(pageNum,pageSize,selectDate, materialOutbound));
    }
    @ApiOperation("材料出库查询接口")
    @SaCheckPermission("CreateOutbound.search")
    @PostMapping("/getSelectMaterialOutbound/{pageNum}/{pageSize}")
    public Result getSelectMaterialOutbound(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialOutboundDetail materialOutboundDetail){
        return Result.seccess(materialInventoryService.getSelectMaterialOutbound(pageNum,pageSize,materialOutboundDetail));
@@ -83,6 +92,7 @@
    @ApiOperation("材料出库审核接口")
    @SaCheckPermission("CreateOutbound.review")
    @PostMapping("/updateMaterialOutboundToExamine")
    public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){
        if(materialInventoryService.updateMaterialOutboundToExamine(object)){
@@ -94,7 +104,8 @@
        }
    }
    @ApiOperation("物料删除接口")
    @ApiOperation("材料出库删除接口")
    @SaCheckPermission("MaterialOutbound.delete")
    @PostMapping("/deleteMaterialOutbound")
    public Result deleteMaterialOutbound( @RequestBody Map<String,Object>  object){
        if(materialInventoryService.deleteMaterialOutbound(object)){
@@ -108,6 +119,7 @@
    }
    @ApiOperation("物料返库新增接口")
    @SaCheckPermission("ReturnToStorageCreate.add")
    @PostMapping("/saveReturningWarehouse")
    public Result saveReturningWarehouse( @RequestBody Map<String,Object>  object){
        if(materialInventoryService.saveReturningWarehouse(object)){
@@ -119,12 +131,14 @@
    }
    @ApiOperation("物料返库新增查询接口")
    @SaCheckPermission("ReturnToStorageCreate.search")
    @PostMapping("/getSelectReturningWarehouse/{pageNum}/{pageSize}")
    public Result getSelectReturningWarehouse(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody ReturningWarehouseDetail returningWarehouseDetail){
        return Result.seccess(materialInventoryService.getSelectReturningWarehouse(pageNum,pageSize,returningWarehouseDetail));
    }
    @ApiOperation("物料返库审核接口")
    @SaCheckPermission("ReturnToStorageCreate.review")
    @PostMapping("/updateReturningWarehouseToExamine")
    public Result updateReturningWarehouseToExamine( @RequestBody Map<String,Object> object){
        if(materialInventoryService.updateReturningWarehouseToExamine(object)){
@@ -138,6 +152,7 @@
    @ApiOperation("物料返库查询接口")
    @SaCheckPermission("ReturnToStorage.search")
    @PostMapping("/getSelectReturningWarehouseDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectReturningWarehouseDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody ReturningWarehouse returningWarehouse){
        return Result.seccess(materialInventoryService.getSelectReturningWarehouseDate(pageNum,pageSize,selectDate, returningWarehouse));
north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java
@@ -1,6 +1,7 @@
package com.example.erp.controller.mm;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.mm.MaterialStore;
@@ -21,6 +22,7 @@
    MaterialStoreService materialStoreService;
    @ApiOperation("物料新增接口")
    @SaCheckPermission("CreateIngredients.add")
    @PostMapping("/saveMaterialStore")
    public Result saveMaterialStore( @RequestBody Map<String,Object>  object){
        if(materialStoreService.saveMaterialStore(object)){
@@ -32,12 +34,14 @@
    }
    @ApiOperation("物料查询接口")
    @SaCheckPermission("SelectIngredients.search")
    @PostMapping("/getSelectMaterialStore/{pageNum}/{pageSize}")
    public Result getSelectMaterialStore(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody MaterialStore materialStore){
        return Result.seccess(materialStoreService.getSelectMaterialStore(pageNum,pageSize,materialStore));
    }
    @ApiOperation("物料删除接口")
    @SaCheckPermission("SelectIngredients.delete")
    @PostMapping("/deleteMaterialStore")
    public Result deleteMaterialStore( @RequestBody Map<String,Object>  object){
        if(materialStoreService.deleteMaterialStore(object)){
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReplenishController.java
@@ -1,5 +1,6 @@
package com.example.erp.controller.pp;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.PatchLog;
@@ -27,12 +28,14 @@
    /*发货订单查询*/
    @ApiOperation("补片新增查询接口")
    @SaCheckPermission("AddReplenish.search")
    @PostMapping("/getSelectReplenish/{pageNum}/{pageSize}")
    public Result getSelectReplenish(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
        return Result.seccess(replenishService.getSelectReplenish(pageNum,pageSize));
    }
    @ApiOperation("补片查询接口")
    @SaCheckPermission("SelectReplenish.search")
    @PostMapping("/SelectReplenish/{pageNum}/{pageSize}/{selectDate}")
    public Result SelectReplenish(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody PatchLog patchLog){
        return Result.seccess(replenishService.SelectReplenish(pageNum,pageSize,selectDate,patchLog));
@@ -40,6 +43,7 @@
    @ApiOperation("补片新增接口")
    @SaCheckPermission("AddReplenish.add")
    @PostMapping("/saveReplenish")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
        if(replenishService.saveReplenish(object)){
@@ -53,6 +57,7 @@
    }
    @ApiOperation("补片审核接口")
    @SaCheckPermission("SelectReplenish.review")
    @PostMapping("/updateReplenish")
    public Result updateReplenish( @RequestBody Map<String,Object> object){
        if(replenishService.updateReplenish(object)){
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReworkController.java
@@ -1,5 +1,6 @@
package com.example.erp.controller.pp;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.pp.Rework;
@@ -27,19 +28,22 @@
    /*发货订单查询*/
    @ApiOperation("可返工数据查询接口")
    @SaCheckPermission("AddRework.search")
    @PostMapping("/getSelectRework/{pageNum}/{pageSize}")
    public Result getSelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize){
        return Result.seccess(reworkService.getSelectRework(pageNum,pageSize));
    }
    @ApiOperation("返工数据查询接口")
    @SaCheckPermission("SelectRework.search")
    @PostMapping("/SelectRework/{pageNum}/{pageSize}/{selectDate}")
    public Result SelectRework(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate,@RequestBody Rework rework){
        return Result.seccess(reworkService.SelectRework(pageNum,pageSize,selectDate,rework));
    }
    @ApiOperation("返工接口")
    @ApiOperation("返工接口新增")
    @SaCheckPermission("AddRework.add")
    @PostMapping("/saveRework")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object> object){
        if(reworkService.saveRework(object)){
@@ -53,6 +57,7 @@
    }
    @ApiOperation("返工审核接口")
    @SaCheckPermission("SelectRework.review")
    @PostMapping("/updateRework")
    public Result updateRework( @RequestBody Map<String,Object> object){
        if(reworkService.updateRework(object)){
north-glass-erp/src/main/java/com/example/erp/controller/sd/CustomerController.java
@@ -1,6 +1,7 @@
package com.example.erp.controller.sd;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.sd.Customer;
@@ -28,12 +29,14 @@
    /*发货订单查询*/
    @ApiOperation("客户查询接口")
    @SaCheckPermission("selectCustomer.search")
    @PostMapping("/getSelectCustomer/{pageNum}/{pageSize}")
    public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody Customer customer){
        return Result.seccess(customerService.getSelectCustomer(pageNum,pageSize,customer));
    }
    @ApiOperation("客户新增修改接口")
    @SaCheckPermission("CreateCustomer.add")
    @PostMapping("/insertCustomer")
    public Result insertCustomer( @RequestBody Map<String,Object>  object){
        if(customerService.insertCustomer(object)){
@@ -47,6 +50,7 @@
    }
    @ApiOperation("客户删除接口")
    @SaCheckPermission("selectCustomer.delete")
    @PostMapping("/deleteCustomer")
    public Result deleteCustomer( @RequestBody Map<String,Object>  object){
        if(customerService.deleteCustomer(object)){
@@ -60,6 +64,7 @@
    }
    @ApiOperation("客户订单查询接口")
    @SaCheckPermission("selectCustomerOrder.search")
    @PostMapping("/getSelectCustomerOderDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectCustomerOderDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody OrderDetail orderDetail){
        return Result.seccess(customerService.getSelectCustomerOderDate(pageNum,pageSize,selectDate,orderDetail));
north-glass-erp/src/main/java/com/example/erp/controller/sd/DeliveryController.java
@@ -1,6 +1,7 @@
package com.example.erp.controller.sd;
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.example.erp.common.Constants;
import com.example.erp.common.Result;
import com.example.erp.entity.mm.FinishedGoodsInventory;
@@ -28,6 +29,7 @@
    /*发货订单查询*/
    @ApiOperation("发货订单查询接口")
    @SaCheckPermission("selectDelivery.search")
    @PostMapping("/getSelectShippingOrder/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectShippingOrder(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Delivery delivery){
        return Result.seccess(deliveryService.getSelectShippingOrder(pageNum,pageSize,selectDate,delivery));
@@ -35,6 +37,7 @@
    /*发货报表查询*/
    @ApiOperation("发货报表查询接口")
    @SaCheckPermission("deliveryReport.search")
    @PostMapping("/getSelectDeliveryDetailReport/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectDeliveryDetailReport(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody DeliveryDetail deliveryDetail){
        return Result.seccess(deliveryService.getSelectDeliveryDetailReport(pageNum,pageSize,selectDate,deliveryDetail));
@@ -42,6 +45,7 @@
    /*发货订单明细查询*/
    @ApiOperation("发货编辑订单明细查询接口")
    @SaCheckPermission("createDelivery.search")
    @PostMapping("/getSelectShippingOrderDetail/{pageNum}/{pageSize}")
    public Result getSelectShippingOrderDetail(@PathVariable Integer pageNum, @PathVariable Integer pageSize,  @RequestBody OrderDetail orderDetail){
        return Result.seccess(deliveryService.getSelectShippingOrderDetail(pageNum,pageSize,orderDetail));
@@ -49,6 +53,7 @@
    /*库存可发货订单查询*/
    @ApiOperation("库存可发货订单查询接口接口")
    @SaCheckPermission("selectOrderList.search")
    @PostMapping("/getSelectOrderInventory/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectOrderInventory(@PathVariable Integer pageNum, @PathVariable Integer pageSize,@PathVariable List<String> selectDate, @RequestBody Order order){
        return Result.seccess(deliveryService.getSelectOrderInventory(pageNum,pageSize,selectDate,order));
@@ -56,11 +61,13 @@
    /*发货订单明细查询*/
    @ApiOperation("发货新增订单明细查询接口")
    @SaCheckPermission("createDelivery.search")
    @PostMapping("/getSelectShippingOrderDetails/{pageNum}/{pageSize}")
    public Result getSelectShippingOrderDetails(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @RequestBody OrderDetail orderDetail){
        return Result.seccess(deliveryService.getSelectShippingOrderDetails(pageNum,pageSize,orderDetail));
    }
    @ApiOperation("发货新增接口")
    @SaCheckPermission("createDelivery.add")
    @PostMapping("/insertDelivery")
    public Result insertDelivery( @RequestBody Map<String,Object> object){
        if(deliveryService.insertDelivery(object)){
@@ -72,6 +79,7 @@
        }
    }
    @ApiOperation("发货审核修改接口")
    @SaCheckPermission("createDelivery.review")
    @PostMapping("/updateDeliveryToExamine")
    public Result updateDeliveryToExamine( @RequestBody Map<String,Object> object){
        if(deliveryService.updateDeliveryToExamine(object)){
@@ -84,6 +92,7 @@
    }
    @ApiOperation("发货删除接口")
    @SaCheckPermission("selectDelivery.delete")
    @PostMapping("/deleteDelivery")
    public Result deleteDelivery( @RequestBody Map<String,Object> object){
        if(deliveryService.deleteDelivery(object)){
@@ -96,6 +105,7 @@
    }
    @ApiOperation("发货订单查询接口")
    @SaCheckPermission("selectDelivery.search")
    @PostMapping("/getSelectDeliveryPrinting")
    public Result getSelectDeliveryPrinting( @RequestBody DeliveryDetail deliveryDetail){
        return Result.seccess(deliveryService.getSelectDeliveryPrinting(deliveryDetail));