白坯原材料入库

op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInController.java

@@ -2,6 +2,8 @@ package com.op.wms.controller;
 
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import com.op.common.security.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -37,7 +39,7 @@ public class BpRawMaterialInController extends BaseController
     /**
      * 查询白坯原材料入库列表
      */
-    @PreAuthorize("@ss.hasPermi('wms:raw:list')")
+    @RequiresPermissions("wms:raw:list")
     @GetMapping("/list")
     public TableDataInfo list(BpRawMaterialIn bpRawMaterialIn)
     {
@@ -49,7 +51,7 @@ public class BpRawMaterialInController extends BaseController
     /**
      * 导出白坯原材料入库列表
      */
-    @PreAuthorize("@ss.hasPermi('wms:raw:export')")
+    @RequiresPermissions("wms:raw:export")
     @Log(title = "白坯原材料入库", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BpRawMaterialIn bpRawMaterialIn)
@@ -62,7 +64,7 @@ public class BpRawMaterialInController extends BaseController
     /**
      * 获取白坯原材料入库详细信息
      */
-    @PreAuthorize("@ss.hasPermi('wms:raw:query')")
+    @RequiresPermissions("wms:raw:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
@@ -72,7 +74,7 @@ public class BpRawMaterialInController extends BaseController
     /**
      * 新增白坯原材料入库
      */
-    @PreAuthorize("@ss.hasPermi('wms:raw:add')")
+    @RequiresPermissions("wms:raw:add")
     @Log(title = "白坯原材料入库", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BpRawMaterialIn bpRawMaterialIn)
@@ -83,7 +85,7 @@ public class BpRawMaterialInController extends BaseController
     /**
      * 修改白坯原材料入库
      */
-    @PreAuthorize("@ss.hasPermi('wms:raw:edit')")
+    @RequiresPermissions("wms:raw:edit")
     @Log(title = "白坯原材料入库", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BpRawMaterialIn bpRawMaterialIn)
@@ -94,7 +96,7 @@ public class BpRawMaterialInController extends BaseController
     /**
      * 删除白坯原材料入库
      */
-    @PreAuthorize("@ss.hasPermi('wms:raw:remove')")
+    @RequiresPermissions("wms:raw:remove")
     @Log(title = "白坯原材料入库", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)

op-modules/op-wms/src/main/java/com/op/wms/controller/BpRawMaterialInDetailController.java

@@ -4,6 +4,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
 import com.microsoft.windowsazure.exception.ServiceException;
+import com.op.common.security.annotation.RequiresPermissions;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -39,7 +40,7 @@ public class BpRawMaterialInDetailController extends BaseController
     /**
      * 查询白坯原材料入库明细列表
      */
-    @PreAuthorize("@ss.hasPermi('wms:detail:list')")
+    @RequiresPermissions("wms:detail:list")
     @GetMapping("/list")
     public TableDataInfo list(BpRawMaterialInDetail bpRawMaterialInDetail)
     {
@@ -51,7 +52,7 @@ public class BpRawMaterialInDetailController extends BaseController
     /**
      * 导出白坯原材料入库明细列表
      */
-    @PreAuthorize("@ss.hasPermi('wms:detail:export')")
+    @RequiresPermissions("wms:detail:export")
     @Log(title = "白坯原材料入库明细", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, BpRawMaterialInDetail bpRawMaterialInDetail)
@@ -64,7 +65,7 @@ public class BpRawMaterialInDetailController extends BaseController
     /**
      * 获取白坯原材料入库明细详细信息
      */
-    @PreAuthorize("@ss.hasPermi('wms:detail:query')")
+    @RequiresPermissions("wms:detail:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id)
     {
@@ -74,7 +75,7 @@ public class BpRawMaterialInDetailController extends BaseController
     /**
      * 新增白坯原材料入库明细
      */
-    @PreAuthorize("@ss.hasPermi('wms:detail:add')")
+    @RequiresPermissions("wms:detail:add")
     @Log(title = "白坯原材料入库明细", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody BpRawMaterialInDetail bpRawMaterialInDetail) throws ServiceException {
@@ -84,7 +85,7 @@ public class BpRawMaterialInDetailController extends BaseController
     /**
      * 修改白坯原材料入库明细
      */
-    @PreAuthorize("@ss.hasPermi('wms:detail:edit')")
+    @RequiresPermissions("wms:detail:edit")
     @Log(title = "白坯原材料入库明细", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody BpRawMaterialInDetail bpRawMaterialInDetail)
@@ -95,11 +96,12 @@ public class BpRawMaterialInDetailController extends BaseController
     /**
      * 删除白坯原材料入库明细
      */
-    @PreAuthorize("@ss.hasPermi('wms:detail:remove')")
+    @RequiresPermissions("wms:detail:remove")
     @Log(title = "白坯原材料入库明细", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable String[] ids)
     {
-        return toAjax(bpRawMaterialInDetailService.deleteBpRawMaterialInDetailByIds(ids));
+        AjaxResult  result=  bpRawMaterialInDetailService.deleteBpRawMaterialInDetailByIds(ids);
+        return result;
     }
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IBpRawMaterialInDetailService.java

@@ -3,6 +3,7 @@ package com.op.wms.service;
 import java.util.List;
 
 import com.microsoft.windowsazure.exception.ServiceException;
+import com.op.common.core.web.domain.AjaxResult;
 import com.op.wms.domain.BpRawMaterialInDetail;
 
 /**
@@ -51,7 +52,7 @@ public interface IBpRawMaterialInDetailService
      * @param ids 需要删除的白坯原材料入库明细主键集合
      * @return 结果
      */
-    public int deleteBpRawMaterialInDetailByIds(String[] ids);
+    public AjaxResult deleteBpRawMaterialInDetailByIds(String[] ids);
 
     /**
      * 删除白坯原材料入库明细信息

op-modules/op-wms/src/main/java/com/op/wms/service/impl/BpRawMaterialInDetailServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.microsoft.windowsazure.exception.ServiceException;
 import com.op.common.core.context.SecurityContextHolder;
 import com.op.common.core.utils.uuid.IdUtils;
+import com.op.common.core.web.domain.AjaxResult;
 import com.op.wms.domain.BaseProduct;
 import com.op.wms.domain.BpRawMaterialIn;
 import com.op.wms.mapper.BaseProductMapper;
@@ -72,6 +73,7 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS
     @Override
     @DS("#header.poolName")
     public int insertBpRawMaterialInDetail(BpRawMaterialInDetail bpRawMaterialInDetail) throws ServiceException {
+        int  reselt=1;
         //获取当前所选工厂
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
         String key = "#header.poolName";
@@ -103,7 +105,7 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS
             bpRawMaterialIn1.setMaterialCode(String.valueOf(baseProduct));
             bpRawMaterialIn1.setUnit(bpRawMaterialInDetail.getUnit());
             bpRawMaterialIn1.setAmountReal(bpRawMaterialInDetail.getAmountReal());
-            bpRawMaterialInMapper.insertBpRawMaterialIn(bpRawMaterialIn1);
+            reselt=bpRawMaterialInMapper.insertBpRawMaterialIn(bpRawMaterialIn1);
         }else {
             //物料存在，加库存
             bpRawMaterialIn.getAmountReal();//原有
@@ -111,7 +113,6 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS
             bpRawMaterialIn.setAmountReal(bpRawMaterialIn.getAmountReal()+bpRawMaterialInDetail.getAmountReal());
             bpRawMaterialInMapper.updateBpRawMaterialIn(bpRawMaterialIn);
         }
-        int  reselt=1;
         return reselt;
     }
 
@@ -136,9 +137,24 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS
      */
     @Override
     @DS("#header.poolName")
-    public int deleteBpRawMaterialInDetailByIds(String[] ids)
+    public AjaxResult deleteBpRawMaterialInDetailByIds(String[] ids)
     {
-        return bpRawMaterialInDetailMapper.deleteBpRawMaterialInDetailByIds(ids);
+        for (String id : ids) {
+            BpRawMaterialInDetail bpRawMaterialInDetail = bpRawMaterialInDetailMapper.selectBpRawMaterialInDetailById(id);
+            BpRawMaterialIn bpRawMaterialIn = bpRawMaterialInMapper.selectBpRawMaterialInBymateriaName(bpRawMaterialInDetail.getMaterialName());
+            if (bpRawMaterialIn==null){
+                bpRawMaterialInDetailMapper.deleteBpRawMaterialInDetailById(id);
+            }else {
+                if (bpRawMaterialIn.getAmountReal()>=bpRawMaterialInDetail.getAmountReal()){
+                    bpRawMaterialInDetailMapper.deleteBpRawMaterialInDetailById(id);
+                    bpRawMaterialIn.setAmountReal(bpRawMaterialIn.getAmountReal()-bpRawMaterialInDetail.getAmountReal());
+                    bpRawMaterialInMapper.updateBpRawMaterialIn(bpRawMaterialIn);
+                }else {
+                    return AjaxResult.error();
+                }
+            }
+        }
+        return  AjaxResult.success();
     }
 
     /**
@@ -149,8 +165,7 @@ public class BpRawMaterialInDetailServiceImpl implements IBpRawMaterialInDetailS
      */
     @Override
     @DS("#header.poolName")
-    public int deleteBpRawMaterialInDetailById(String id)
+    public int deleteBpRawMaterialInDetailById(String id) {
-    {
         return bpRawMaterialInDetailMapper.deleteBpRawMaterialInDetailById(id);
     }
 }