Merge branch 'develop' of http://gitlab.sothing.top/843502640/jyzb_platformV2 into develop-zhaojw

jyzb-biz/src/main/java/com/junmp/jyzb/entity/OrderNum.java

@@ -35,6 +35,9 @@ public class OrderNum implements Serializable {
     @TableField("end_org_id")
     private Long endOrgId;
 
+    @TableField("org_id")
+    private Long orgId;
+
     /**
      * 创建时间
      */

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

@@ -150,15 +150,15 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         //获取年,月，日，获取业务出入状态，获取组织机构id，获取业务类型
         orderNum.setYear(LocalDateTime.now().getYear());
         //将业务类型转为中文简写
-        String itemValue = sysDictItemService.getOne(new LambdaQueryWrapper<SysDictItem>()
-                .eq(SysDictItem::getItemText, req.getBussinessType())).getItemValue();
+        String itemValue = sysDictItemService.list(new LambdaQueryWrapper<SysDictItem>()
+                .eq(SysDictItem::getItemText, req.getBussinessType())).get(0).getItemValue();
         orderNum.setBussinessType(itemValue);
         //出入业务状态
         orderNum.setOutInType(req.getOrderType());
         //判断是出库还是入库，出库为发物单位，入库为收物单位
         OrderNum one = new OrderNum();
         if (req.getOrderType().equals("in")){
-            orderNum.setEndOrgId(Long.valueOf(req.getEndOrgId()));
+            orderNum.setEndOrgId(req.getEndOrgId());
             one = orderNumService.getOne(new LambdaQueryWrapper<OrderNum>()
                     .eq(OrderNum::getEndOrgId, orderNum.getEndOrgId())
                     .eq(OrderNum::getBussinessType, orderNum.getBussinessType())

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

@@ -113,13 +113,13 @@ public class StocktakeServiceImpl extends ServiceImpl<StocktakeMapper, Stocktake
         //获取年,月，日，获取组织机构id，获取业务类型
         orderNum.setYear(LocalDateTime.now().getYear());
         orderNum.setBussinessType(req.getBussinessType());
-//        orderNum.setOrgId(req.getOrgId());
+        orderNum.setOrgId(req.getOrgId());
         //将业务类型转为中文简写
         String itemValue = sysDictItemService.getOne(new LambdaQueryWrapper<SysDictItem>()
                 .eq(SysDictItem::getItemText, req.getBussinessType())).getItemValue();
         orderNum.setBussinessType(itemValue);
         OrderNum one = orderNumService.getOne(new LambdaQueryWrapper<OrderNum>()
-//                .eq(OrderNum::getOrgId, orderNum.getOrgId())
+                .eq(OrderNum::getOrgId, orderNum.getOrgId())
                 .eq(OrderNum::getBussinessType, orderNum.getBussinessType())
                 .eq(OrderNum::getYear, orderNum.getYear()));
         //设置num的数量