零售单按钮权限、销售出库修改零售单状态

zkqy-custom-business/src/main/java/com/zkqy/business/controller/SaleOrderController.java

@@ -145,6 +145,7 @@ public class SaleOrderController extends BaseController {
     /**
      * 新增零售单
      */
+    @PreAuthorize("@ss.hasPermi('system:RetailOrder:insert')")
     @PostMapping("/addRetailOrder")
     public AjaxResult addRetailOrder(@RequestBody SaleOrderVO vo) {
         return success(saleOrderService.addRetailOrder(vo));
@@ -154,6 +155,7 @@ public class SaleOrderController extends BaseController {
     /**
      * 零售单详情
      */
+    @PreAuthorize("@ss.hasPermi('system:RetailOrder:info')")
     @GetMapping("/getRetailOrderInfo/{id}")
     public AjaxResult getRetailOrderInfo(@PathVariable Long id) {
         return success(saleOrderService.getRetailOrderInfo(id));
@@ -162,6 +164,7 @@ public class SaleOrderController extends BaseController {
     /**
      * 修改零售单
      */
+    @PreAuthorize("@ss.hasPermi('system:RetailOrder:update')")
     @PutMapping("/editRetailOrder")
     public AjaxResult editRetailOrder(@RequestBody SaleOrderVO vo) {
         return toAjax(saleOrderService.editRetailOrder(vo));
@@ -170,6 +173,7 @@ public class SaleOrderController extends BaseController {
     /**
      * 零售单提交
      */
+    @PreAuthorize("@ss.hasPermi('system:RetailOrder:submit')")
     @PostMapping("/submitRetailOrder")
     public AjaxResult submitRetailOrder(@RequestBody ProductInvoice productInvoice) {
         return toAjax(saleOrderService.submitRetailOrder(productInvoice));
@@ -178,6 +182,7 @@ public class SaleOrderController extends BaseController {
     /**
      * 零售单撤销
      */
+    @PreAuthorize("@ss.hasPermi('system:RetailOrder:cancel')")
     @PostMapping("/cancelRetailOrder")
     public AjaxResult cancelRetailOrder(@RequestBody ProductInvoice productInvoice) {
         return toAjax(saleOrderService.cancelRetailOrder(productInvoice));
@@ -186,7 +191,7 @@ public class SaleOrderController extends BaseController {
     /**
      * 零售单删除
      */
-    @PreAuthorize("@ss.hasPermi('system:order:remove')")
+    @PreAuthorize("@ss.hasPermi('system:RetailOrder:remove')")
     @Log(title = "销售订单", businessType = BusinessType.DELETE)
     @DeleteMapping("/RetailOrder/{ids}")
     @ApiOperation(value = "删除销售订单")

zkqy-custom-business/src/main/java/com/zkqy/business/service/impl/ProductInventoryServiceImpl.java

@@ -43,6 +43,9 @@ public class ProductInventoryServiceImpl implements IProductInventoryService {
     @Autowired
     private ProductInvoiceMapper productInvoiceMapper;
 
+    @Autowired
+    private SaleOrderMapper saleOrderMapper;
+
 
     /**
      * 查询产品库存
@@ -299,7 +302,18 @@ public class ProductInventoryServiceImpl implements IProductInventoryService {
                 editProductInventory.setTotalGrossWeight(handlingWeight(productInventory.getTotalGrossWeight() - productHandsetOutboundRecord1.getGrossWeight()));
             }
             productInventoryMapper.updateProductInventory(editProductInventory);
+        }
 
+        //修改销售单状态为已完成
+        //查询通知单详情获取
+        ProductInvoice productInvoice2 = productInvoiceMapper.selectProductInvoiceById(productInvoice.getId());
+        //判断当前订单是否为零售单
+        SaleOrder saleOrder1 = saleOrderMapper.selectSaleOrderBySaleNo(productInvoice2.getSaleOrderNo());
+        if(saleOrder1.getSaleOrderTechnologyNo().equals("retailOrder")){
+            SaleOrder saleOrder = new SaleOrder();
+            saleOrder.setSaleNo(productInvoice2.getSaleOrderNo());
+            saleOrder.setStatus("6");
+            saleOrderMapper.updateSaleOrderBySaleNo(saleOrder);
         }
         return AjaxResult.success();
     }