单据管理相关

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -103,7 +103,7 @@ public class UdiRelevanceController {
     }
 
 
-    //基础信息-耗材字典-查询页面
+    //基础信息-耗材字典-查询页面、业务单据-选入耗材字典-查询页面
     @AuthRuleAnnotation("")
     @GetMapping("/udi/udirel/filterUdi")
     public BaseResponse filterUdiGp(FilterUdiRelRequest filterUdiRelRequest,
@@ -621,4 +621,7 @@ public class UdiRelevanceController {
     }
 
 
+    //业务单据选入耗材字典查询列表
+
+
 }

src/main/java/com/glxp/api/controller/inout/IoCodeController.java

@@ -1,54 +1,8 @@
 package com.glxp.api.controller.inout;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
-import com.glxp.api.annotation.AuthRuleAnnotation;
-import com.glxp.api.common.enums.ResultEnum;
-import com.glxp.api.common.res.BaseResponse;
-import com.glxp.api.common.util.ResultVOUtils;
-import com.glxp.api.constant.Constant;
-import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.controller.BaseController;
-import com.glxp.api.entity.auth.AuthAdmin;
-import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
-import com.glxp.api.entity.basic.BasicCorpEntity;
-import com.glxp.api.entity.basic.UdiEntity;
-import com.glxp.api.entity.basic.UdiProductEntity;
-import com.glxp.api.entity.inout.IoCodeEnttity;
-import com.glxp.api.entity.inout.IoOrderEntity;
-import com.glxp.api.entity.system.SystemParamConfigEntity;
-import com.glxp.api.http.SpsDirectClient;
-import com.glxp.api.req.basic.CompanyProductRelevanceRequest;
-import com.glxp.api.req.inout.AddEnterCodeRequest;
-import com.glxp.api.req.inout.AddOrderRequest;
-import com.glxp.api.req.inout.PostOrderRequest;
-import com.glxp.api.res.basic.UdiRlSupResponse;
-import com.glxp.api.res.basic.UdiRelevanceResponse;
-import com.glxp.api.res.inout.AddCodeResult;
-import com.glxp.api.service.basic.*;
-import com.glxp.api.service.inout.IoCodeService;
-import com.glxp.api.service.inout.IoOrderService;
-import com.glxp.api.service.inout.IoTransInoutService;
-import com.glxp.api.service.system.SystemParamConfigService;
-import com.glxp.api.util.CustomUtil;
-import com.glxp.api.util.DateUtil;
-import com.glxp.api.util.GennerOrderUtils;
-import com.glxp.api.util.OrderNoTypeBean;
-import com.glxp.api.util.udi.FilterUdiUtils;
-import com.glxp.api.util.udi.UdiCalCountUtil;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanUtils;
-import org.springframework.validation.BindingResult;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-
 @RestController
 public class IoCodeController extends BaseController {
 

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -1,10 +1,17 @@
 package com.glxp.api.controller.inout;
 
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.service.inout.IoOrderService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 
 @Slf4j
@@ -14,4 +21,15 @@ public class IoOrderController {
     @Resource
     IoOrderService orderService;
 
+    @AuthRuleAnnotation("")
+    @GetMapping("udiwms/inout/order/draft")
+    public BaseResponse getDrafts() {
+        List<IoOrderEntity> orderEntityList = orderService.selectAll();
+        PageSimpleResponse<IoOrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(100l);
+        pageSimpleResponse.setList(orderEntityList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
 }

src/main/java/com/glxp/api/controller/inout/IoOrderDetailController.java

@@ -0,0 +1,36 @@
+package com.glxp.api.controller.inout;
+
+import com.glxp.api.annotation.AuthRuleAnnotation;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.dao.inout.IoOrderDetailCodeDao;
+import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
+import com.glxp.api.res.PageSimpleResponse;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+public class IoOrderDetailController {
+
+
+    @Resource
+    IoOrderDetailCodeDao ioOrderDetailCodeDao;
+
+    //获取新增扫码单据详情---临时接口查询
+    @AuthRuleAnnotation("")
+    @GetMapping("udiwms/inout/order/draft/detailCode")
+    public BaseResponse getDraftsDetailCode() {
+        List<IoOrderDetailCodeEntity> orderEntityList = ioOrderDetailCodeDao.selectList();
+        PageSimpleResponse<IoOrderDetailCodeEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(100l);
+        pageSimpleResponse.setList(orderEntityList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    //录入业务单据详情
+
+}

src/main/java/com/glxp/api/service/inout/IoOrderService.java

@@ -2,8 +2,13 @@ package com.glxp.api.service.inout;
 
 import com.glxp.api.entity.inout.IoOrderEntity;
 
+import java.util.List;
+
 public interface IoOrderService {
 
+
+    List<IoOrderEntity>  selectAll();
+
     IoOrderEntity findById(String orderId);
 
     IoOrderEntity findByBillNo(String billNO);

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -7,6 +7,7 @@ import com.glxp.api.service.inout.IoOrderService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Service
 public class IoOrderServiceImpl implements IoOrderService {
@@ -14,6 +15,11 @@ public class IoOrderServiceImpl implements IoOrderService {
     @Resource
     IoOrderDao orderDao;
 
+    @Override
+    public List<IoOrderEntity> selectAll() {
+        return orderDao.selectList();
+    }
+
     @Override
     public IoOrderEntity findById(String orderId) {
         return orderDao.selectById(orderId);