1

jyzb-biz/src/main/java/com/junmp/jyzb/service/impl/OrderMainServiceImpl.java

@@ -785,6 +785,10 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
 
             e = policeBindEqs(req, reqList, orgId);
         }
+        //如果是归还入库，将警员下面的装备进行处理
+        if (req.getBussinessType().equals("return")){
+
+        }
         //如果是快速移库，记账完成之后新增入库单并且该单据不走审核流，但是审核状态和入库状态显示已完成
         boolean f=true;
         if (req.getBussinessType().equals("quick")){
@@ -805,7 +809,11 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         //更新主单据
         return (a && b && c && d && e && f );
     }
+    public boolean policeUnBindEqs(UpdateOrderReq req,List<UpdateOrderDetailReq> reqList,Long orgId){
+        //根据传递的装备信息对警员进行解绑操作
 
+        return  true;
+    }
     public boolean policeBindEqs(UpdateOrderReq req,List<UpdateOrderDetailReq> reqList,Long orgId){
         //如果是领用出库，那记账结束以后将装备挂到警员名下（存储到policemanEquipment表中）
         if (req.getBussinessType().equals("use")){
@@ -876,6 +884,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
                     }else if (req.getOrderType().equals("out") && req.getBussinessType().equals("destruction")){//销毁出库直接减库存，减金额
                         is.setPrice(is.getPrice().subtract(BigDecimal.valueOf(upReq.getModifyQuantity()).multiply(upReq.getPrice())));
                         is.setNumber(is.getNumber()-upReq.getModifyQuantity());
+                        is.setStockNumber(is.getStockNumber()-upReq.getModifyQuantity());
                         is.setDestructionNumber(is.getDestructionNumber()+upReq.getModifyQuantity());
                     }else {//其他出库就直接正常计算
                         is.setOutboundNumber(is.getOutboundNumber()+upReq.getModifyQuantity());