From 2f8a03ced17c8b736e1e4b189bbf301b73f238e1 Mon Sep 17 00:00:00 2001 From: anthonyywj2 <353682448@qq.com> Date: Thu, 2 Jun 2022 13:18:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E9=AA=8C=E6=94=B6=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E5=A7=94=E6=89=98=E9=AA=8C=E6=94=B6=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/OrderController.java | 36 +++++++++++++++++-- .../controller/inout/WareHouseController.java | 18 +++++++--- .../admin/entity/basic/EntrustReceEntity.java | 1 + .../req/inout/StockOrderFilterRequest.java | 1 + .../admin/res/basic/EntrustReceRespose.java | 2 ++ .../res/inout/WarehouseUserResponse.java | 34 ++++++++++++++++++ .../mybatis/mapper/basic/EntrustReceDao.xml | 16 ++++++--- .../mybatis/mapper/inout/StockOrderDao.xml | 22 +++++++++++- 8 files changed, 117 insertions(+), 13 deletions(-) create mode 100644 api-admin/src/main/java/com/glxp/sale/admin/res/inout/WarehouseUserResponse.java diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java index 50b72b3..1621cb6 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/OrderController.java @@ -233,12 +233,31 @@ public class OrderController { BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderFilterRequest.getAction()); StockOrderEntity stockOrderEntity = stockOrderService.findByBillNo(orderFilterRequest.getOrderId()); + + + if (stockOrderEntity == null || stockOrderEntity.getOrderIdFk() == null) { return ResultVOUtils.error(500, "单据未找到！"); } else if (!bussinessTypeEntity.getLocalAction().equals(stockOrderEntity.getBillType())) { return ResultVOUtils.error(500, "非" + bussinessTypeEntity.getName() + "类型单据！"); } else { + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); orderFilterRequest.setId(stockOrderEntity.getOrderIdFk()); + stockOrderFilterRequest.setUserId(customerService.getUserId()); +// if (StrUtil.isNotEmpty(stockOrderFilterRequest.getLocStorageCode())) { +// InvWarehouseEntity invWarehouseEntity = invWarehouseService.selectByCode(stockOrderFilterRequest.getLocStorageCode()); +// FilterInvUserRequest filterInvUserRequest = new FilterInvUserRequest(); +// filterInvUserRequest.setCode(invWarehouseEntity.getCode()); +// filterInvUserRequest.setUserid(userId.longValue()); +// filterInvUserRequest.setIsDirector(true); +// List warehouseUserEntities = warehouseUserService.filterWarehouseUsers(filterInvUserRequest); +// if (CollUtil.isEmpty(warehouseUserEntities)) { +// stockOrderFilterRequest.setUnionUser(userId); +// } +// } + + + } if (orderFilterRequest.getOrderId() == null || "".equals(orderFilterRequest.getOrderId())) { orderFilterRequest.setId(null); @@ -247,8 +266,11 @@ public class OrderController { if (orderEntity.getReceiveStatus() == ConstantStatus.RECEIVE_ED) { return ResultVOUtils.error(500, "单据已验收！"); } - } + + + + List orderEntityList; if (orderFilterRequest.getStatus() == null || orderFilterRequest.getStatus() == 0) { orderFilterRequest.setStatus(4); @@ -274,9 +296,14 @@ public class OrderController { BindingResult bindingResult) { AuthAdmin authAdmin = customerService.getUserBean(); + long customerId = customerService.getCustomerId(); + return updateReview(authAdmin, customerId, updateExportStatusRequest); + + } + + public BaseResponse updateReview(AuthAdmin authAdmin, long customerId, UpdateExportStatusRequest updateExportStatusRequest) { OrderEntity orderEntity = orderService.findById(updateExportStatusRequest.getOrderId()); orderEntity.setReceiveStatus(1); - long customerId = customerService.getCustomerId(); if (customerId == 110) { orderEntity.setReviewUser(authAdmin.getId().intValue()); } @@ -328,7 +355,10 @@ public class OrderController { return ResultVOUtils.error(500, "未找到该业务单据"); } updateExportStatusRequest.setOrderId(temp.getOrderIdFk()); - return updateStatus(updateExportStatusRequest, null); + + AuthAdmin authAdmin = customerService.getUserBean(); + long customerId = customerService.getCustomerId(); + return updateReview(authAdmin, customerId, updateExportStatusRequest); } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java index 33a9bd4..91b3ed9 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java @@ -29,6 +29,7 @@ import com.glxp.sale.admin.res.basic.BussinessTypResponse; import com.glxp.sale.admin.res.basic.CompanyProductRelevanceResponse; import com.glxp.sale.admin.res.basic.UdiRelevanceResponse; import com.glxp.sale.admin.res.inout.WarehouseResponse; +import com.glxp.sale.admin.res.inout.WarehouseUserResponse; import com.glxp.sale.admin.service.auth.AuthAdminService; import com.glxp.sale.admin.service.auth.CustomerService; import com.glxp.sale.admin.service.basic.BasicUnitMaintainService; @@ -58,6 +59,7 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.util.*; +import java.util.function.Consumer; import java.util.stream.Collectors; @RestController @@ -452,16 +454,16 @@ public class WareHouseController { boolean checkSuccess = true; String lostMsg = ""; //校验条码完整性 - if ("是".equals(checkUdi.getScbssfbhph()) && StrUtil.isEmpty(udiEntity.getBatchNo())) { + if ("是".equals(checkUdi.getScbssfbhph()) && StrUtil.isEmpty(udiEntity.getBatchNo())) { checkSuccess = false; lostMsg = lostMsg + ",批次号"; } - if ("是".equals(checkUdi.getScbssfbhscrq()) && StrUtil.isEmpty(udiEntity.getProduceDate())) { + if ("是".equals(checkUdi.getScbssfbhscrq()) && StrUtil.isEmpty(udiEntity.getProduceDate())) { checkSuccess = false; lostMsg = lostMsg + ",生产日期"; } - if ("是".equals(checkUdi.getScbssfbhsxrq()) && StrUtil.isEmpty(udiEntity.getExpireDate())) { + if ("是".equals(checkUdi.getScbssfbhsxrq()) && StrUtil.isEmpty(udiEntity.getExpireDate())) { checkSuccess = false; lostMsg = lostMsg + ",失效日期"; } @@ -1043,7 +1045,15 @@ public class WareHouseController { public BaseResponse getWarehouseUserList(String code) { if (StringUtils.isBlank(code)) return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL); - return ResultVOUtils.success(warehouseUserService.getListByCode(code)); + List warehouseUserEntities = warehouseUserService.getListByCode(code); + List result = new ArrayList<>(); + warehouseUserEntities.forEach(warehouseUserEntity -> { + WarehouseUserResponse warehouseUserResponse = new WarehouseUserResponse(); + BeanUtils.copyProperties(warehouseUserEntity, warehouseUserResponse); + warehouseUserResponse.setUserid(warehouseUserEntity.getUserid() + ""); + result.add(warehouseUserResponse); + }); + return ResultVOUtils.success(result); } @AuthRuleAnnotation("") diff --git a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/EntrustReceEntity.java b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/EntrustReceEntity.java index 12daee9..83e73cb 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/EntrustReceEntity.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/entity/basic/EntrustReceEntity.java @@ -10,6 +10,7 @@ public class EntrustReceEntity { private Integer id; private String action; + private String curInv; private String entrustInv; private String entrustUser; private String userId; diff --git a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java index d455204..726ad43 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java @@ -34,5 +34,6 @@ public class StockOrderFilterRequest extends ListPageRequest { private Integer reviewUser; private Integer userId; private Integer unionUser; + private String entrustUser; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceRespose.java b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceRespose.java index 3f27ad2..ad88c1c 100644 --- a/api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceRespose.java +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/basic/EntrustReceRespose.java @@ -19,5 +19,7 @@ public class EntrustReceRespose { private String entrustName; private String employeeName; private String entrustInvName; + private String curInv; + private String curInvName; } diff --git a/api-admin/src/main/java/com/glxp/sale/admin/res/inout/WarehouseUserResponse.java b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/WarehouseUserResponse.java new file mode 100644 index 0000000..f0f9572 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/sale/admin/res/inout/WarehouseUserResponse.java @@ -0,0 +1,34 @@ +package com.glxp.sale.admin.res.inout; + +import lombok.Data; + +@Data +public class WarehouseUserResponse { + + /** + * id + */ + private String id; + + /** + * 仓位码 + */ + private String code; + + /** + * 用户id + */ + private String userid; + + /** + * 用户名/登录账号 + */ + private String username; + + /** + * 是否是仓库主管 + */ + private boolean isDirector; + + private String employeeName; +} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml index 927df99..eae7699 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/EntrustReceDao.xml @@ -30,12 +30,13 @@ resultType="com.glxp.sale.admin.res.basic.EntrustReceRespose"> select basic_entrust_accept.* , a.name curName, b.name entrustName,auth_user.employeeName - ,inv_warehouse.name entrustInvName + ,c.name entrustInvName,d.name curInvName from basic_entrust_accept - LEFT JOIN basic_bussiness_type a on basic_entrust_accept.action = a.action + LEFT JOIN basic_bustype_local a on basic_entrust_accept.action = a.action LEFT JOIN basic_bussiness_type b on basic_entrust_accept.entrustAction = b.action LEFT JOIN auth_user on basic_entrust_accept.entrustUser = auth_user.id - LEFT JOIN inv_warehouse on basic_entrust_accept.entrustInv = inv_warehouse.`code` + LEFT JOIN inv_warehouse c on basic_entrust_accept.entrustInv = c.`code` + LEFT JOIN inv_warehouse d on basic_entrust_accept.curInv = d.`code` and id = #{id} @@ -60,8 +61,9 @@ replace - INTO basic_entrust_accept(`action`, entrustInv, `entrustUser`, userId, updateTime, remark,entrustAction,finishRece) + INTO basic_entrust_accept(id,`action`, entrustInv, `entrustUser`, userId, updateTime, remark,entrustAction,finishRece,curInv) values ( + #{id}, #{action}, #{entrustInv}, #{entrustUser}, @@ -69,7 +71,8 @@ #{updateTime}, #{remark}, #{entrustAction}, - #{finishRece} + #{finishRece}, + #{curInv} ) @@ -81,7 +84,10 @@ entrustUser=#{entrustUser}, userId=#{userId}, updateTime=#{updateTime}, + curInv=#{curInv}, remark=#{remark}, + finishRece=#{finishRece}, + entrustAction=#{entrustAction}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml index 4a10b0b..d461d8e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml @@ -181,6 +181,27 @@ + + + +