xignzi006 发布系统代码

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/extensions/service/Purchase_orderExService.java

@@ -22,34 +22,34 @@ public class Purchase_orderExService extends Purchase_orderServiceImpl {
     }
 
     /**
-     * 自定义行为[Action_view_invoice]用户扩展
+     * 自定义行为[Button_cancel]用户扩展
      * @param et
      * @return
      */
     @Override
     @Transactional
-    public Purchase_order action_view_invoice(Purchase_order et) {
-        return super.action_view_invoice(et);
+    public Purchase_order button_cancel(Purchase_order et) {
+        return super.button_cancel(et);
     }
     /**
-     * 自定义行为[Action_view_picking]用户扩展
+     * 自定义行为[Button_confirm]用户扩展
      * @param et
      * @return
      */
     @Override
     @Transactional
-    public Purchase_order action_view_picking(Purchase_order et) {
-        return super.action_view_picking(et);
+    public Purchase_order button_confirm(Purchase_order et) {
+        return super.button_confirm(et);
     }
     /**
-     * 自定义行为[Button_confirm]用户扩展
+     * 自定义行为[Button_done]用户扩展
      * @param et
      * @return
      */
     @Override
     @Transactional
-    public Purchase_order button_confirm(Purchase_order et) {
-        return super.button_confirm(et);
+    public Purchase_order button_done(Purchase_order et) {
+        return super.button_done(et);
     }
     /**
      * 自定义行为[Button_unlock]用户扩展

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/client/purchase_orderFallback.java

@@ -64,15 +64,15 @@ public class purchase_orderFallback implements purchase_orderFeignClient{
 
 
 
-    public Purchase_order action_view_invoice( Long id, Purchase_order purchase_order){
+    public Purchase_order button_cancel( Long id, Purchase_order purchase_order){
             return null;
      }
 
-    public Purchase_order action_view_picking( Long id, Purchase_order purchase_order){
+    public Purchase_order button_confirm( Long id, Purchase_order purchase_order){
             return null;
      }
 
-    public Purchase_order button_confirm( Long id, Purchase_order purchase_order){
+    public Purchase_order button_done( Long id, Purchase_order purchase_order){
             return null;
      }
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/client/purchase_orderFeignClient.java

@@ -60,18 +60,18 @@ public interface purchase_orderFeignClient {
     Purchase_order getDraft();
 
 
-    @RequestMapping(method = RequestMethod.POST, value = "/purchase_orders/{id}/action_view_invoice")
-    Purchase_order action_view_invoice(@PathVariable("id") Long id,@RequestBody Purchase_order purchase_order);
-
-
-    @RequestMapping(method = RequestMethod.POST, value = "/purchase_orders/{id}/action_view_picking")
-    Purchase_order action_view_picking(@PathVariable("id") Long id,@RequestBody Purchase_order purchase_order);
+    @RequestMapping(method = RequestMethod.POST, value = "/purchase_orders/{id}/button_cancel")
+    Purchase_order button_cancel(@PathVariable("id") Long id,@RequestBody Purchase_order purchase_order);
 
 
     @RequestMapping(method = RequestMethod.POST, value = "/purchase_orders/{id}/button_confirm")
     Purchase_order button_confirm(@PathVariable("id") Long id,@RequestBody Purchase_order purchase_order);
 
 
+    @RequestMapping(method = RequestMethod.POST, value = "/purchase_orders/{id}/button_done")
+    Purchase_order button_done(@PathVariable("id") Long id,@RequestBody Purchase_order purchase_order);
+
+
     @RequestMapping(method = RequestMethod.POST, value = "/purchase_orders/{id}/button_unlock")
     Purchase_order button_unlock(@PathVariable("id") Long id,@RequestBody Purchase_order purchase_order);
 

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/IPurchase_orderService.java

@@ -34,9 +34,9 @@ public interface IPurchase_orderService extends IService<Purchase_order>{
     void removeBatch(Collection<Long> idList) ;
     Purchase_order get(Long key) ;
     Purchase_order getDraft(Purchase_order et) ;
-    Purchase_order action_view_invoice(Purchase_order et) ;
-    Purchase_order action_view_picking(Purchase_order et) ;
+    Purchase_order button_cancel(Purchase_order et) ;
     Purchase_order button_confirm(Purchase_order et) ;
+    Purchase_order button_done(Purchase_order et) ;
     Purchase_order button_unlock(Purchase_order et) ;
     boolean checkKey(Purchase_order et) ;
     boolean save(Purchase_order et) ;

businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/odoo_purchase/service/impl/Purchase_orderServiceImpl.java

@@ -158,21 +158,21 @@ public class Purchase_orderServiceImpl extends ServiceImpl<Purchase_orderMapper,
 
     @Override
     @Transactional
-    public Purchase_order action_view_invoice(Purchase_order et) {
+    public Purchase_order button_cancel(Purchase_order et) {
         //自定义代码
         return et;
     }
 
     @Override
     @Transactional
-    public Purchase_order action_view_picking(Purchase_order et) {
+    public Purchase_order button_confirm(Purchase_order et) {
         //自定义代码
         return et;
     }
 
     @Override
     @Transactional
-    public Purchase_order button_confirm(Purchase_order et) {
+    public Purchase_order button_done(Purchase_order et) {
         //自定义代码
         return et;
     }

businesscentral-provider/businesscentral-provider-core/src/main/java/cn/ibizlab/businesscentral/core/rest/Purchase_orderResource.java

@@ -115,35 +115,35 @@ public class Purchase_orderResource {
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderMapping.toDto(purchase_orderService.getDraft(new Purchase_order())));
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Action_view_invoice-all')")
-    @ApiOperation(value = "创建账单", tags = {"采购订单" },  notes = "创建账单")
-	@RequestMapping(method = RequestMethod.POST, value = "/purchase_orders/{purchase_order_id}/action_view_invoice")
-    public ResponseEntity<Purchase_orderDTO> action_view_invoice(@PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_cancel-all')")
+    @ApiOperation(value = "取消", tags = {"采购订单" },  notes = "取消")
+	@RequestMapping(method = RequestMethod.POST, value = "/purchase_orders/{purchase_order_id}/button_cancel")
+    public ResponseEntity<Purchase_orderDTO> button_cancel(@PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
         Purchase_order domain = purchase_orderMapping.toDomain(purchase_orderdto);
         domain.setId(purchase_order_id);
-        domain = purchase_orderService.action_view_invoice(domain);
+        domain = purchase_orderService.button_cancel(domain);
         purchase_orderdto = purchase_orderMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderdto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Action_view_picking-all')")
-    @ApiOperation(value = "接收产品", tags = {"采购订单" },  notes = "接收产品")
-	@RequestMapping(method = RequestMethod.POST, value = "/purchase_orders/{purchase_order_id}/action_view_picking")
-    public ResponseEntity<Purchase_orderDTO> action_view_picking(@PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_confirm-all')")
+    @ApiOperation(value = "确认订单", tags = {"采购订单" },  notes = "确认订单")
+	@RequestMapping(method = RequestMethod.POST, value = "/purchase_orders/{purchase_order_id}/button_confirm")
+    public ResponseEntity<Purchase_orderDTO> button_confirm(@PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
         Purchase_order domain = purchase_orderMapping.toDomain(purchase_orderdto);
         domain.setId(purchase_order_id);
-        domain = purchase_orderService.action_view_picking(domain);
+        domain = purchase_orderService.button_confirm(domain);
         purchase_orderdto = purchase_orderMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderdto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_confirm-all')")
-    @ApiOperation(value = "确认订单", tags = {"采购订单" },  notes = "确认订单")
-	@RequestMapping(method = RequestMethod.POST, value = "/purchase_orders/{purchase_order_id}/button_confirm")
-    public ResponseEntity<Purchase_orderDTO> button_confirm(@PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_done-all')")
+    @ApiOperation(value = "锁定", tags = {"采购订单" },  notes = "锁定")
+	@RequestMapping(method = RequestMethod.POST, value = "/purchase_orders/{purchase_order_id}/button_done")
+    public ResponseEntity<Purchase_orderDTO> button_done(@PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
         Purchase_order domain = purchase_orderMapping.toDomain(purchase_orderdto);
         domain.setId(purchase_order_id);
-        domain = purchase_orderService.button_confirm(domain);
+        domain = purchase_orderService.button_done(domain);
         purchase_orderdto = purchase_orderMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderdto);
     }
@@ -305,35 +305,35 @@ public class Purchase_orderResource {
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderMapping.toDto(purchase_orderService.getDraft(domain)));
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Action_view_invoice-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_cancel-all')")
     @ApiOperation(value = "根据采购申请采购订单", tags = {"采购订单" },  notes = "根据采购申请采购订单")
-	@RequestMapping(method = RequestMethod.POST, value = "/purchase_requisitions/{purchase_requisition_id}/purchase_orders/{purchase_order_id}/action_view_invoice")
-    public ResponseEntity<Purchase_orderDTO> action_view_invoiceByPurchase_requisition(@PathVariable("purchase_requisition_id") Long purchase_requisition_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
+	@RequestMapping(method = RequestMethod.POST, value = "/purchase_requisitions/{purchase_requisition_id}/purchase_orders/{purchase_order_id}/button_cancel")
+    public ResponseEntity<Purchase_orderDTO> button_cancelByPurchase_requisition(@PathVariable("purchase_requisition_id") Long purchase_requisition_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
         Purchase_order domain = purchase_orderMapping.toDomain(purchase_orderdto);
         domain.setRequisitionId(purchase_requisition_id);
-        domain = purchase_orderService.action_view_invoice(domain) ;
+        domain = purchase_orderService.button_cancel(domain) ;
         purchase_orderdto = purchase_orderMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderdto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Action_view_picking-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_confirm-all')")
     @ApiOperation(value = "根据采购申请采购订单", tags = {"采购订单" },  notes = "根据采购申请采购订单")
-	@RequestMapping(method = RequestMethod.POST, value = "/purchase_requisitions/{purchase_requisition_id}/purchase_orders/{purchase_order_id}/action_view_picking")
-    public ResponseEntity<Purchase_orderDTO> action_view_pickingByPurchase_requisition(@PathVariable("purchase_requisition_id") Long purchase_requisition_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
+	@RequestMapping(method = RequestMethod.POST, value = "/purchase_requisitions/{purchase_requisition_id}/purchase_orders/{purchase_order_id}/button_confirm")
+    public ResponseEntity<Purchase_orderDTO> button_confirmByPurchase_requisition(@PathVariable("purchase_requisition_id") Long purchase_requisition_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
         Purchase_order domain = purchase_orderMapping.toDomain(purchase_orderdto);
         domain.setRequisitionId(purchase_requisition_id);
-        domain = purchase_orderService.action_view_picking(domain) ;
+        domain = purchase_orderService.button_confirm(domain) ;
         purchase_orderdto = purchase_orderMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderdto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_confirm-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_done-all')")
     @ApiOperation(value = "根据采购申请采购订单", tags = {"采购订单" },  notes = "根据采购申请采购订单")
-	@RequestMapping(method = RequestMethod.POST, value = "/purchase_requisitions/{purchase_requisition_id}/purchase_orders/{purchase_order_id}/button_confirm")
-    public ResponseEntity<Purchase_orderDTO> button_confirmByPurchase_requisition(@PathVariable("purchase_requisition_id") Long purchase_requisition_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
+	@RequestMapping(method = RequestMethod.POST, value = "/purchase_requisitions/{purchase_requisition_id}/purchase_orders/{purchase_order_id}/button_done")
+    public ResponseEntity<Purchase_orderDTO> button_doneByPurchase_requisition(@PathVariable("purchase_requisition_id") Long purchase_requisition_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
         Purchase_order domain = purchase_orderMapping.toDomain(purchase_orderdto);
         domain.setRequisitionId(purchase_requisition_id);
-        domain = purchase_orderService.button_confirm(domain) ;
+        domain = purchase_orderService.button_done(domain) ;
         purchase_orderdto = purchase_orderMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderdto);
     }
@@ -502,35 +502,35 @@ public class Purchase_orderResource {
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderMapping.toDto(purchase_orderService.getDraft(domain)));
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Action_view_invoice-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_cancel-all')")
     @ApiOperation(value = "根据供应商采购订单", tags = {"采购订单" },  notes = "根据供应商采购订单")
-	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/{res_supplier_id}/purchase_orders/{purchase_order_id}/action_view_invoice")
-    public ResponseEntity<Purchase_orderDTO> action_view_invoiceByRes_supplier(@PathVariable("res_supplier_id") Long res_supplier_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
+	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/{res_supplier_id}/purchase_orders/{purchase_order_id}/button_cancel")
+    public ResponseEntity<Purchase_orderDTO> button_cancelByRes_supplier(@PathVariable("res_supplier_id") Long res_supplier_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
         Purchase_order domain = purchase_orderMapping.toDomain(purchase_orderdto);
         domain.setPartnerId(res_supplier_id);
-        domain = purchase_orderService.action_view_invoice(domain) ;
+        domain = purchase_orderService.button_cancel(domain) ;
         purchase_orderdto = purchase_orderMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderdto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Action_view_picking-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_confirm-all')")
     @ApiOperation(value = "根据供应商采购订单", tags = {"采购订单" },  notes = "根据供应商采购订单")
-	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/{res_supplier_id}/purchase_orders/{purchase_order_id}/action_view_picking")
-    public ResponseEntity<Purchase_orderDTO> action_view_pickingByRes_supplier(@PathVariable("res_supplier_id") Long res_supplier_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
+	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/{res_supplier_id}/purchase_orders/{purchase_order_id}/button_confirm")
+    public ResponseEntity<Purchase_orderDTO> button_confirmByRes_supplier(@PathVariable("res_supplier_id") Long res_supplier_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
         Purchase_order domain = purchase_orderMapping.toDomain(purchase_orderdto);
         domain.setPartnerId(res_supplier_id);
-        domain = purchase_orderService.action_view_picking(domain) ;
+        domain = purchase_orderService.button_confirm(domain) ;
         purchase_orderdto = purchase_orderMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderdto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_confirm-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_done-all')")
     @ApiOperation(value = "根据供应商采购订单", tags = {"采购订单" },  notes = "根据供应商采购订单")
-	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/{res_supplier_id}/purchase_orders/{purchase_order_id}/button_confirm")
-    public ResponseEntity<Purchase_orderDTO> button_confirmByRes_supplier(@PathVariable("res_supplier_id") Long res_supplier_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
+	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/{res_supplier_id}/purchase_orders/{purchase_order_id}/button_done")
+    public ResponseEntity<Purchase_orderDTO> button_doneByRes_supplier(@PathVariable("res_supplier_id") Long res_supplier_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
         Purchase_order domain = purchase_orderMapping.toDomain(purchase_orderdto);
         domain.setPartnerId(res_supplier_id);
-        domain = purchase_orderService.button_confirm(domain) ;
+        domain = purchase_orderService.button_done(domain) ;
         purchase_orderdto = purchase_orderMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderdto);
     }
@@ -699,35 +699,35 @@ public class Purchase_orderResource {
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderMapping.toDto(purchase_orderService.getDraft(domain)));
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Action_view_invoice-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_cancel-all')")
     @ApiOperation(value = "根据供应商采购申请采购订单", tags = {"采购订单" },  notes = "根据供应商采购申请采购订单")
-	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/{res_supplier_id}/purchase_requisitions/{purchase_requisition_id}/purchase_orders/{purchase_order_id}/action_view_invoice")
-    public ResponseEntity<Purchase_orderDTO> action_view_invoiceByRes_supplierPurchase_requisition(@PathVariable("res_supplier_id") Long res_supplier_id, @PathVariable("purchase_requisition_id") Long purchase_requisition_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
+	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/{res_supplier_id}/purchase_requisitions/{purchase_requisition_id}/purchase_orders/{purchase_order_id}/button_cancel")
+    public ResponseEntity<Purchase_orderDTO> button_cancelByRes_supplierPurchase_requisition(@PathVariable("res_supplier_id") Long res_supplier_id, @PathVariable("purchase_requisition_id") Long purchase_requisition_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
         Purchase_order domain = purchase_orderMapping.toDomain(purchase_orderdto);
         domain.setRequisitionId(purchase_requisition_id);
-        domain = purchase_orderService.action_view_invoice(domain) ;
+        domain = purchase_orderService.button_cancel(domain) ;
         purchase_orderdto = purchase_orderMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderdto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Action_view_picking-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_confirm-all')")
     @ApiOperation(value = "根据供应商采购申请采购订单", tags = {"采购订单" },  notes = "根据供应商采购申请采购订单")
-	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/{res_supplier_id}/purchase_requisitions/{purchase_requisition_id}/purchase_orders/{purchase_order_id}/action_view_picking")
-    public ResponseEntity<Purchase_orderDTO> action_view_pickingByRes_supplierPurchase_requisition(@PathVariable("res_supplier_id") Long res_supplier_id, @PathVariable("purchase_requisition_id") Long purchase_requisition_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
+	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/{res_supplier_id}/purchase_requisitions/{purchase_requisition_id}/purchase_orders/{purchase_order_id}/button_confirm")
+    public ResponseEntity<Purchase_orderDTO> button_confirmByRes_supplierPurchase_requisition(@PathVariable("res_supplier_id") Long res_supplier_id, @PathVariable("purchase_requisition_id") Long purchase_requisition_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
         Purchase_order domain = purchase_orderMapping.toDomain(purchase_orderdto);
         domain.setRequisitionId(purchase_requisition_id);
-        domain = purchase_orderService.action_view_picking(domain) ;
+        domain = purchase_orderService.button_confirm(domain) ;
         purchase_orderdto = purchase_orderMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderdto);
     }
 
-    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_confirm-all')")
+    @PreAuthorize("hasAnyAuthority('ROLE_SUPERADMIN','iBizBusinessCentral-Purchase_order-Button_done-all')")
     @ApiOperation(value = "根据供应商采购申请采购订单", tags = {"采购订单" },  notes = "根据供应商采购申请采购订单")
-	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/{res_supplier_id}/purchase_requisitions/{purchase_requisition_id}/purchase_orders/{purchase_order_id}/button_confirm")
-    public ResponseEntity<Purchase_orderDTO> button_confirmByRes_supplierPurchase_requisition(@PathVariable("res_supplier_id") Long res_supplier_id, @PathVariable("purchase_requisition_id") Long purchase_requisition_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
+	@RequestMapping(method = RequestMethod.POST, value = "/res_suppliers/{res_supplier_id}/purchase_requisitions/{purchase_requisition_id}/purchase_orders/{purchase_order_id}/button_done")
+    public ResponseEntity<Purchase_orderDTO> button_doneByRes_supplierPurchase_requisition(@PathVariable("res_supplier_id") Long res_supplier_id, @PathVariable("purchase_requisition_id") Long purchase_requisition_id, @PathVariable("purchase_order_id") Long purchase_order_id, @RequestBody Purchase_orderDTO purchase_orderdto) {
         Purchase_order domain = purchase_orderMapping.toDomain(purchase_orderdto);
         domain.setRequisitionId(purchase_requisition_id);
-        domain = purchase_orderService.button_confirm(domain) ;
+        domain = purchase_orderService.button_done(domain) ;
         purchase_orderdto = purchase_orderMapping.toDto(domain);
         return ResponseEntity.status(HttpStatus.OK).body(purchase_orderdto);
     }