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

chenlu

2024-09-27 e6d98dc8232feae94c6f695926fc75b89dfcf662

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

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -337,7 +337,8 @@

    workOrder:{
        page:{
            selectWorkOrder:'工单管理'
            selectWorkOrder:'工单管理',
            addWorkOrder:'转生产订单'
        },
        productionId:'生产订单号',
        convert:'已转',

 north-glass-erp/src/main/java/com/example/erp/controller/mm/FinishedGoodsInventoryController.java

@@ -35,7 +35,7 @@

    /*成品库存查询*/
    @ApiOperation("成品库存查询接口")
    @SaCheckPermission("ProductStockList.search")
    @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));
@@ -43,7 +43,7 @@

    /*查询可入库的成品数据*/
    @ApiOperation("可入库的成品查询接口")
    @SaCheckPermission("CreateProductStock.search")
    @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));
@@ -51,7 +51,7 @@

    /*成品入库*/
    @ApiOperation("成品入库接口")
    @SaCheckPermission("CreateProductStock.add")
    @SaCheckPermission("createProductStock.add")
    @PostMapping("/addSelectWarehousing")
    public Result addSelectWarehousing( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.addSelectWarehousing(object));
@@ -60,7 +60,7 @@

    /*查询可发货的成品数据*/
    @ApiOperation("可发货的成品查询接口")
    @SaCheckPermission("FinishedProductOut.search")
    @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));
@@ -68,7 +68,7 @@

    /*成品发货*/
    @ApiOperation("成品发货接口")
    @SaCheckPermission("FinishedProductOut.add")
    @SaCheckPermission("finishedProductOut.add")
    @PostMapping("/addDeliveryDetail")
    public Result addDeliveryDetail( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.addDeliveryDetail(object));
@@ -76,7 +76,7 @@

    /* 调拨查询*/
    @ApiOperation("可调拨数据查询接口")
    @SaCheckPermission("OrderAllocation.search")
    @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));
@@ -84,7 +84,7 @@

    /*订单调拨*/
    @ApiOperation("订单调拨接口")
    @SaCheckPermission("OrderAllocation.add")
    @SaCheckPermission("orderAllocation.add")
    @PostMapping("/updateFinishedGoodsInventoryAllocate")
    public Result updateFinishedGoodsInventoryAllocate( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryAllocate(object));
@@ -92,7 +92,7 @@

    /*调拨记录查询*/
    @ApiOperation("调拨记录查询接口")
    @SaCheckPermission("TransferRecord.search")
    @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));
@@ -100,7 +100,7 @@

    /*订单领出*/
    @ApiOperation("订单领出接口")
    @SaCheckPermission("FinishedGoodsIssue.add")
    @SaCheckPermission("finishedGoodsIssue.add")
    @PostMapping("/updateFinishedGoodsInventoryTakeOut")
    public Result updateFinishedGoodsInventoryTakeOut( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryTakeOut(object));
@@ -108,7 +108,7 @@

    /*领出记录查询*/
    @ApiOperation("领出记录查询接口")
    @SaCheckPermission("TakeOutRecord.search")
    @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));
@@ -125,14 +125,14 @@

    /*订单审核*/
    @ApiOperation("订单审核接口")
    @SaCheckPermission("TakeOutRecord.review")
    @SaCheckPermission("takeOutRecord.review")
    @PostMapping("/updateFinishedGoodsInventoryToExamine")
    public Result updateFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"审核"));
    }
    /*订单反审*/
    @ApiOperation("订单反审接口")
    @SaCheckPermission("TakeOutRecord.review")
    @SaCheckPermission("takeOutRecord.review")
    @PostMapping("/updateFinishedGoodsInventoryCounterExamination")
    public Result updateFinishedGoodsInventoryCounterExamination( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.updateFinishedGoodsInventoryToExamine(object,"反审"));
@@ -140,7 +140,7 @@

    /*订单作废*/
    @ApiOperation("订单作废接口")
    @SaCheckPermission("TakeOutRecord.update")
    @SaCheckPermission("takeOutRecord.update")
    @PostMapping("/cancelFinishedGoodsInventoryToExamine")
    public Result cancelFinishedGoodsInventoryToExamine( @RequestBody Map<String,Object>  object){
        return Result.seccess(finishedGoodsInventoryService.cancelFinishedGoodsInventoryToExamine(object));
@@ -163,7 +163,7 @@
    }

    @ApiOperation("成品库存记录查询接口")
    @SaCheckPermission("WarehouseReport.search")
    @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));
@@ -179,7 +179,7 @@

    /*订单一键入库*/
    @ApiOperation("订单一键入库")
    @SaCheckPermission("CreateProductStock.add")
    @SaCheckPermission("createProductStock.add")
    @PostMapping("/oneClickStorage/{orderId}/{userName}")
    public Result oneClickStorage( @PathVariable String  orderId,@PathVariable String  userName){
        return Result.seccess(finishedGoodsInventoryService.oneClickStorage(orderId,userName));

 north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialInventoryController.java

@@ -25,7 +25,7 @@
    MaterialInventoryService materialInventoryService;

    @ApiOperation("物料出库新增接口")
    @SaCheckPermission("CreateOutbound.add")
    @SaCheckPermission("createOutbound.add")
    @PostMapping("/saveMaterialOutbound")
    public Result saveMaterialOutbound( @RequestBody Map<String,Object>  object){

@@ -34,7 +34,7 @@
    }

    @ApiOperation("物料新增接口")
    @SaCheckPermission("SelectIngredientsStock.add")
    @SaCheckPermission("selectIngredientsStock.add")
    @PostMapping("/saveMaterialInventory")
    public Result saveMaterialInventory( @RequestBody Map<String,Object>  object){
        if(materialInventoryService.saveMaterialInventory(object)){
@@ -46,42 +46,42 @@
    }

    @ApiOperation("物料库存加时间查询接口")
    @SaCheckPermission("SelectIngredientsStock.search")
    @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")
    @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")
    @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")
    @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("材料出库加时间查询接口")
    @SaCheckPermission("MaterialOutbound.search")
    @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")
    @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));
@@ -89,35 +89,35 @@


    @ApiOperation("材料出库审核接口")
    @SaCheckPermission("CreateOutbound.review")
    @SaCheckPermission("createOutbound.review")
    @PostMapping("/updateMaterialOutboundToExamine")
    public Result updateMaterialOutboundToExamine( @RequestBody Map<String,Object> object){
        return Result.seccess(materialInventoryService.updateMaterialOutboundToExamine(object));
    }

    @ApiOperation("材料出库删除接口")
    @SaCheckPermission("MaterialOutbound.delete")
    @SaCheckPermission("materialOutbound.delete")
    @PostMapping("/deleteMaterialOutbound")
    public Result deleteMaterialOutbound( @RequestBody Map<String,Object>  object){
        return Result.seccess(materialInventoryService.deleteMaterialOutbound(object));
    }

    @ApiOperation("物料返库新增接口")
    @SaCheckPermission("ReturnToStorageCreate.add")
    @SaCheckPermission("returnToStorageCreate.add")
    @PostMapping("/saveReturningWarehouse")
    public Result saveReturningWarehouse( @RequestBody Map<String,Object>  object){
        return Result.seccess(materialInventoryService.saveReturningWarehouse(object));
    }

    @ApiOperation("物料返库新增查询接口")
    @SaCheckPermission("ReturnToStorageCreate.search")
    @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")
    @SaCheckPermission("returnToStorageCreate.review")
    @PostMapping("/updateReturningWarehouseToExamine")
    public Result updateReturningWarehouseToExamine( @RequestBody Map<String,Object> object){
        return Result.seccess(materialInventoryService.updateReturningWarehouseToExamine(object));
@@ -125,7 +125,7 @@


    @ApiOperation("物料返库查询接口")
    @SaCheckPermission("ReturnToStorage.search")
    @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));
@@ -133,21 +133,21 @@


    @ApiOperation("余料库存查询接口")
    @SaCheckPermission("SelectIngredientsStock.search")
    @SaCheckPermission("selectIngredientsStock.search")
    @PostMapping("/getSelectSurplusMaterialsDate/{pageNum}/{pageSize}/{selectDate}")
    public Result getSelectSurplusMaterialsDate(@PathVariable Integer pageNum, @PathVariable Integer pageSize, @PathVariable List<String> selectDate, @RequestBody SurplusMaterials surplusMaterials){
        return Result.seccess(materialInventoryService.getSelectSurplusMaterialsDate(pageNum,pageSize,selectDate,surplusMaterials));
    }

    @ApiOperation("余料新增接口")
    @SaCheckPermission("SelectIngredientsStock.search")
    @SaCheckPermission("selectIngredientsStock.search")
    @PostMapping("/addSelectSurplusMaterialsDate")
    public Result addSelectSurplusMaterialsDate( @RequestBody Map<String,Object> object){
        return Result.seccess(materialInventoryService.addSelectSurplusMaterialsDate(object));
    }

    @ApiOperation("物料出库打印接口")
    @SaCheckPermission("SelectIngredientsStock.search")
    @SaCheckPermission("selectIngredientsStock.search")
    @GetMapping ("/printCreateOutbound/{materialOutboundId}")
    public Result printCreateOutbound(@PathVariable String materialOutboundId)  {
        return   Result.seccess(materialInventoryService.printCreateOutbound(materialOutboundId));

 north-glass-erp/src/main/java/com/example/erp/controller/mm/MaterialStoreController.java

@@ -15,28 +15,28 @@
import java.util.Map;

@RestController
@RequestMapping("/MaterialStore")
@RequestMapping("/materialStore")
@Api(value="物料controller",tags={"物料操作接口"})
public class MaterialStoreController {
    @Autowired
    MaterialStoreService materialStoreService;

    @ApiOperation("物料新增接口")
    @SaCheckPermission("CreateIngredients.add")
    @SaCheckPermission("createIngredients.add")
    @PostMapping("/saveMaterialStore")
    public Result saveMaterialStore( @RequestBody Map<String,Object>  object){
        return Result.seccess(materialStoreService.saveMaterialStore(object));
    }

    @ApiOperation("物料查询接口")
    @SaCheckPermission("SelectIngredients.search")
    @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")
    @SaCheckPermission("selectIngredients.delete")
    @PostMapping("/deleteMaterialStore")
    public Result deleteMaterialStore( @RequestBody Map<String,Object>  object){
        return Result.seccess(materialStoreService.deleteMaterialStore(object));

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

@@ -43,7 +43,7 @@
    }

    @ApiOperation("客户新增修改接口")
    @SaCheckPermission("CreateCustomer.add")
    @SaCheckPermission("createCustomer.add")
    @PostMapping("/insertCustomer")
    public Result insertCustomer( @RequestBody Map<String,Object>  object){
        return Result.seccess(customerService.insertCustomer(object));