Merge remote-tracking branch 'origin/master' into ww

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

@@ -328,11 +328,6 @@ public class IoCodeTempController extends BaseController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         AddCodeResult addCodeResult = new AddCodeResult();
-
-        if (addOrderRequest.getAction() == null) {
-            addOrderRequest.setAction(addOrderRequest.getBillType());
-        }
-
         BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction());
         InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(addOrderRequest.getInvCode());
         String code = addOrderRequest.getCode();
@@ -573,7 +568,7 @@ public class IoCodeTempController extends BaseController {
             }
 
 
-            IoOrderEntity isExit = orderService.findById(orderId);
+            IoOrderEntity isExit = orderService.findByBillNo(orderId);
             if (isExit == null) {
                 orderEntity = new IoOrderEntity();
                 orderEntity.setBillNo(orderId);

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

@@ -5,17 +5,25 @@ 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.entity.basic.BasicBussinessTypeEntity;
+import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.req.inout.AddOrderRequest;
 import com.glxp.api.req.inout.FilterOrderRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.inout.IoOrderResponse;
+import com.glxp.api.service.basic.IBasicBussinessTypeService;
+import com.glxp.api.service.inout.IoCodeTempService;
 import com.glxp.api.service.inout.IoOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
+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.Date;
 import java.util.List;
 
 
@@ -25,6 +33,10 @@ public class IoOrderController {
 
     @Resource
     private IoOrderService orderService;
+    @Resource
+    private IBasicBussinessTypeService basicBussinessTypeService;
+    @Resource
+    private IoCodeTempService codeTempService;
 
     /**
      * 查询单据列表
@@ -53,5 +65,29 @@ public class IoOrderController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @AuthRuleAnnotation("")
+    @PostMapping("warehouse/inout/saveOrderWeb")
+    public BaseResponse saveOrderWeb(@RequestBody AddOrderRequest addOrderRequest) {
+        IoOrderEntity orderEntity = new IoOrderEntity();
+        orderEntity.setAction(addOrderRequest.getAction());
+        BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(addOrderRequest.getAction());
+        orderEntity.setMainAction(bussinessTypeEntity.getMainAction());
+        orderEntity.setFromCorp(addOrderRequest.getFromCorp());
+        orderEntity.setFromInvCode(addOrderRequest.getFromInvCode());
+        orderEntity.setDeptCode(addOrderRequest.getDeptCode());
+        orderEntity.setInvCode(addOrderRequest.getInvCode());
+        orderService.updateByBillNo(orderEntity);
+
+
+        IoCodeTempEntity warehouseEntity = new IoCodeTempEntity();
+        warehouseEntity.setOrderId(orderEntity.getBillNo());
+        warehouseEntity.setAction(orderEntity.getAction());
+        warehouseEntity.setMainAction(orderEntity.getMainAction());
+        warehouseEntity.setDeptCode(orderEntity.getDeptCode());
+        warehouseEntity.setInvCode(orderEntity.getInvCode());
+        codeTempService.updateByOrderId(warehouseEntity);
+        return ResultVOUtils.success();
+    }
+
 
 }

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

@@ -2,22 +2,23 @@ package com.glxp.api.controller.inout;
 
 
 import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.Constant;
 import com.glxp.api.controller.BaseController;
-import com.glxp.api.dao.inout.IoOrderDao;
 import com.glxp.api.dao.inout.IoOrderDetailBizDao;
 import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
-import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.req.inout.AddBizProductReqeust;
+import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
 import com.glxp.api.res.basic.UdiRelevanceResponse;
+import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.basic.UdiRelevanceService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
@@ -119,5 +120,17 @@ public class IoOrderDetailBizController extends BaseController {
         return orderDetailBizService.deleteById(Integer.parseInt(deleteRequest.getId())) > 0 ? ResultVOUtils.success("删除成功！") : ResultVOUtils.error(500, "删除失败");
     }
 
+    /**
+     * 查询单据业务详情列表
+     *
+     * @param orderDetailBizRequest
+     * @return
+     */
+    @GetMapping("/udiwms/inout/order/filterList")
+    public BaseResponse filterList(FilterOrderDetailBizRequest orderDetailBizRequest) {
+        List<IoOrderDetailBizResponse> list = orderDetailBizService.filterList(orderDetailBizRequest);
+        PageInfo<IoOrderDetailBizResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
 
 }

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

@@ -1,13 +1,37 @@
 package com.glxp.api.controller.inout;
 
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
+import com.glxp.api.service.inout.IoOrderDetailResultService;
+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 IoOrderDetailResultController {
 
+    @Resource
+    private IoOrderDetailResultService orderDetailResultService;
 
+    /**
+     * 查询单据扫码明细列表
+     *
+     * @param orderDetailResultRequest
+     * @return
+     */
+    @GetMapping("/udiwms/inout/order/filterList")
+    public BaseResponse filterList(FilterOrderDetailResultRequest orderDetailResultRequest) {
+        List<IoOrderDetailResultResponse> list = orderDetailResultService.filterList(orderDetailResultRequest);
+        PageInfo<IoOrderDetailResultResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
 
 }

src/main/java/com/glxp/api/req/inout/AddOrderRequest.java

@@ -10,7 +10,6 @@ public class AddOrderRequest {
     private String action;
     private String fromCorp;
     private String fromInvCode;
-    private String billType;
     private String deptCode;
     private String invCode;
     private String billNo;

src/main/java/com/glxp/api/req/inout/FilterOrderDetailBizRequest.java

@@ -1,12 +1,13 @@
 package com.glxp.api.req.inout;
 
+import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
 /**
  * 单据业务详情查询参数
  */
 @Data
-public class FilterOrderDetailBizRequest {
+public class FilterOrderDetailBizRequest extends ListPageRequest {
 
     /**
      * 耗材字典产品ID

src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java

@@ -1,12 +1,13 @@
 package com.glxp.api.req.inout;
 
+import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
 /**
  * 单据扫码明细查询参数
  */
 @Data
-public class FilterOrderDetailResultRequest {
+public class FilterOrderDetailResultRequest extends ListPageRequest {
 
     /**
      * 单据号

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

@@ -19,12 +19,14 @@ public interface IoCodeTempService {
 
     int updateById(IoCodeTempEntity codeEnttity);
 
+
+    int updateByOrderId(IoCodeTempEntity codeTempEntity);
+
     IoCodeTempEntity findByUnique(String orderId, String code);
 
     List<IoCodeTempEntity> findByOrderId(String billNo);
 
     TableDataInfo<IoCodeTempEntity> findByOrderId(FilterCodeRequest filterCodeRequest);
 
-
     int deleteByBillNo(String orderId);
 }

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

@@ -1,6 +1,8 @@
 package com.glxp.api.service.inout;
 
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
+import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
+import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 
 import java.util.List;
 
@@ -15,4 +17,6 @@ public interface IoOrderDetailBizService {
     int deleteById(Integer id);
 
     boolean isExit(Long relId, String bacthNo,Integer ignoreId);
+
+    List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest);
 }

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

@@ -1,8 +1,8 @@
 package com.glxp.api.service.inout;
 
-import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
-import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
+import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 
 import java.util.List;
 
@@ -13,4 +13,7 @@ public interface IoOrderDetailResultService {
     int insert(IoOrderDetailResultEntity orderDetailResultEntity);
 
     int update(IoOrderDetailResultEntity orderDetailResultEntity);
+
+    List<IoOrderDetailResultResponse> filterList(FilterOrderDetailResultRequest orderDetailResultRequest);
+
 }

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

@@ -21,6 +21,8 @@ public interface IoOrderService {
 
     int update(IoOrderEntity orderEntity);
 
+    int updateByBillNo(IoOrderEntity orderEntity);
+
     /**
      * 查询单据列表
      *

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

@@ -51,6 +51,11 @@ public class IoCodeTempServiceImpl implements IoCodeTempService {
         return ioCodeTempDao.updateById(codeEnttity);
     }
 
+    @Override
+    public int updateByOrderId(IoCodeTempEntity codeTempEntity) {
+        return ioCodeTempDao.update(codeTempEntity, new QueryWrapper<IoCodeTempEntity>().eq("orderId", codeTempEntity.getOrderId()));
+    }
+
     @Override
     public IoCodeTempEntity findByUnique(String orderId, String code) {
         return ioCodeTempDao.selectOne(new QueryWrapper<IoCodeTempEntity>().eq("orderId", orderId).eq("code", code));

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

@@ -1,12 +1,16 @@
 package com.glxp.api.service.inout.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.inout.IoOrderDetailBizDao;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
+import com.glxp.api.req.inout.FilterOrderDetailBizRequest;
+import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -41,5 +45,15 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
         return ioOrderDetailBizDao.exists(new QueryWrapper<IoOrderDetailBizEntity>().eq("bindRlFk", relId).eq("batchNo", bacthNo).ne("id", ignoreId));
     }
 
+    @Override
+    public List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest) {
+        if (null == orderDetailBizRequest) {
+            return Collections.emptyList();
+        }
+        if (null != orderDetailBizRequest.getPage() && null != orderDetailBizRequest.getLimit()) {
+            PageHelper.offsetPage((orderDetailBizRequest.getPage() - 1) * orderDetailBizRequest.getLimit(), orderDetailBizRequest.getLimit());
+        }
+        return ioOrderDetailBizDao.filterList(orderDetailBizRequest);
+    }
 
 }

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

@@ -1,16 +1,16 @@
 package com.glxp.api.service.inout.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.glxp.api.dao.inout.IoOrderDetailBizDao;
-import com.glxp.api.dao.inout.IoOrderDetailCodeDao;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.inout.IoOrderDetailResultDao;
-import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
-import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
+import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
+import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.service.inout.IoOrderDetailResultService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -33,4 +33,15 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
     public int update(IoOrderDetailResultEntity orderDetailResultEntity) {
         return orderDetailResultDao.updateById(orderDetailResultEntity);
     }
+
+    @Override
+    public List<IoOrderDetailResultResponse> filterList(FilterOrderDetailResultRequest orderDetailResultRequest) {
+        if (null == orderDetailResultRequest) {
+            return Collections.emptyList();
+        }
+        if (null == orderDetailResultRequest.getPage() && null == orderDetailResultRequest.getLimit()) {
+            PageHelper.offsetPage((orderDetailResultRequest.getPage() - 1) * orderDetailResultRequest.getLimit(), orderDetailResultRequest.getLimit());
+        }
+        return orderDetailResultDao.filterList(orderDetailResultRequest);
+    }
 }

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

@@ -55,6 +55,11 @@ public class IoOrderServiceImpl implements IoOrderService {
         return orderDao.updateById(orderEntity);
     }
 
+    @Override
+    public int updateByBillNo(IoOrderEntity orderEntity) {
+        return orderDao.update(orderEntity, new QueryWrapper<IoOrderEntity>().eq("billNo", orderEntity.getBillNo()));
+    }
+
     @Override
     public List<IoOrderResponse> filterList(FilterOrderRequest filterOrderRequest) {
         if (null == filterOrderRequest) {