From b78a5a35c3bc921c2dd64fc3ef2529e9ed63f361 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 6 Jul 2023 23:22:27 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E4=B8=A2=E5=A4=B1=EF=BC=8C=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E6=9C=AA=E8=A1=A5=E5=8D=95=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E5=A4=9A=E8=A1=A5=E9=80=80=E8=B4=A7=E5=8D=95=E7=AD=89?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sync/SpsSyncDownloadController.java | 46 +++++++++++++++---- .../entity/inout/IoOrderDetailCodeEntity.java | 3 +- .../glxp/api/req/inout/InvoiceRequest.java | 3 +- .../res/thrsys/ThrBusTypeOriginResponse.java | 2 +- .../service/inout/IoCheckInoutService.java | 18 ++++---- src/main/resources/application-dev.yml | 4 +- .../mybatis/mapper/basic/ProductInfoDao.xml | 4 +- 7 files changed, 53 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java index db8474ff..e0d6ffca 100644 --- a/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java +++ b/src/main/java/com/glxp/api/controller/sync/SpsSyncDownloadController.java @@ -645,18 +645,21 @@ public class SpsSyncDownloadController { orderEntity.setFromType(ConstantStatus.FROM_UDISP); orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); - if (syncDataBustypeEntity != null) { - if (IntUtil.value(syncDataBustypeEntity.getSyncStatus()) == 1) { - orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_DRAFT); - orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); - } - if (syncDataBustypeEntity.isSyncChange()) { - orderEntity.setOutChangeEnable(syncDataBustypeEntity.isSyncChange()); - } - } + IoOrderEntity temp = orderService.findByBillNo(orderEntity.getBillNo()); if (temp == null) { - + if (syncDataBustypeEntity != null) { + if (IntUtil.value(syncDataBustypeEntity.getSyncStatus()) == 1) { + orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_DRAFT); + orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); + } +// 同步单据设置需要自动补单 + if (syncDataBustypeEntity.isSyncChange()) { + orderEntity.setOutChangeEnable(syncDataBustypeEntity.isSyncChange()); +// 平衡补单（只有补单单号为空才会补单） + orderEntity.setSupplementNo(null); + } + } //过滤使用出库单，转换成一级库出库单(条件：往来类型为客户信息，出入库类型为出库，仓库类型为入账库，是否更改库存为是 BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); if (basicBussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT @@ -746,6 +749,29 @@ public class SpsSyncDownloadController { ioCheckInoutService.check(orderEntity.getBillNo()); } } + } else { +// 更新业务详情 + if (orderEntity.getCheckStatus() != null) + orderService.update(orderEntity); + //更新业务详情 + if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailBizEntities())) { + List orderDetailBizEntities = syncDataResponse.getOrderDetailBizEntities(); + for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) { + if (bizEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { + orderDetailBizDao.insertOrUpdate(bizEntity); + } + } + } + + //更新码详情 + if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailCodeEntities())) { + List orderDetailCodeEntities = syncDataResponse.getOrderDetailCodeEntities(); + for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) { + if (codeEntity.getOrderIdFk().equals(orderEntity.getBillNo())) { + orderDetailCodeDao.insertOrUpdate(codeEntity); + } + } + } } } diff --git a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java index fae6b90f..f34c0604 100644 --- a/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java +++ b/src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java @@ -6,12 +6,13 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; +import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @Data @TableName(value = "io_order_detail_code") -public class IoOrderDetailCodeEntity { +public class IoOrderDetailCodeEntity implements Serializable { @TableId(value = "id", type = IdType.INPUT) private Long id; diff --git a/src/main/java/com/glxp/api/req/inout/InvoiceRequest.java b/src/main/java/com/glxp/api/req/inout/InvoiceRequest.java index 60c44044..3898d807 100644 --- a/src/main/java/com/glxp/api/req/inout/InvoiceRequest.java +++ b/src/main/java/com/glxp/api/req/inout/InvoiceRequest.java @@ -3,6 +3,7 @@ package com.glxp.api.req.inout; import com.glxp.api.entity.inout.IoOrderDetailCodeEntity; import lombok.Data; +import java.io.Serializable; import java.util.List; /** @@ -12,7 +13,7 @@ import java.util.List; */ @Data -public class InvoiceRequest { +public class InvoiceRequest implements Serializable { private List list; private String key; diff --git a/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java b/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java index e194717b..1d0c28da 100644 --- a/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java +++ b/src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java @@ -16,7 +16,7 @@ public class ThrBusTypeOriginResponse { /** * id */ - private Integer id; + private Long id; /** * 单据类型名称 diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index b83a8a5b..e4a9e21b 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -26,10 +26,7 @@ import com.glxp.api.service.inout.impl.IoOrderInvoiceService; import com.glxp.api.service.inv.InvPreinDetailService; import com.glxp.api.service.inv.InvPreinOrderService; import com.glxp.api.service.inv.InvPreinProductDetailService; -import com.glxp.api.util.CustomUtil; -import com.glxp.api.util.GennerOrderUtils; -import com.glxp.api.util.JasperUtils; -import com.glxp.api.util.OrderNoTypeBean; +import com.glxp.api.util.*; import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiCalCountUtil; import lombok.RequiredArgsConstructor; @@ -304,12 +301,10 @@ public class IoCheckInoutService { orderService.update(orderEntity); return; } - if (orderEntity.getFromType() != ConstantStatus.FROM_COPY - && orderEntity.getFromType() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType() != ConstantStatus.FROM_UDIMS) { - orderDetailBizService.deleteByOrderId(orderEntity.getBillNo()); - } - if (orderEntity.getFromType() != ConstantStatus.FROM_UDISP && orderEntity.getFromType() != ConstantStatus.FROM_UDIMS) { + + if (orderEntity.getFromType() != ConstantStatus.FROM_UDISP + && orderEntity.getFromType() != ConstantStatus.FROM_UDIMS) { if (orderEntity.getFromType() != ConstantStatus.FROM_COPY && orderEntity.getFromType() != ConstantStatus.FROM_CHANGE) { orderDetailBizService.deleteByOrderId(orderEntity.getBillNo()); @@ -856,8 +851,11 @@ public class IoCheckInoutService { //校验完成后生成库存 public void genInv(IoOrderEntity orderEntity, BasicBussinessTypeEntity bussinessTypeEntity) { - if (bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT) && bussinessTypeEntity.isScanPreIn()) { + if ( + IntUtil.value(orderEntity.getFromType()) != ConstantStatus.FROM_UDISP && + bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_OUT) && bussinessTypeEntity.isScanPreIn()) { // ThreadUtil.execAsync(() -> { +// 内网同步出来不进行退货 if (StrUtil.isNotEmpty(bussinessTypeEntity.getPreInBackAction())) { if (bussinessTypeEntity.getBackPreinType() == 1) { //按单退货 diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 58b5a4cc..49e15b9b 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -3,9 +3,9 @@ server: spring: datasource: driver-class-name: com.p6spy.engine.spy.P6SpyDriver - jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_spms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true + jdbc-url: jdbc:p6spy:mysql://192.168.0.66:3364/udi_spms_zzzyy?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true username: root - password: 123456 + password: Glxp@6066 hikari: connection-timeout: 60000 maximum-pool-size: 60 diff --git a/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml b/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml index 83aa43b3..ed14d700 100644 --- a/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml +++ b/src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml @@ -412,7 +412,7 @@ - REPLACE INTO productinfo @@ -476,7 +476,7 @@ - REPLACE INTO productinfo (id, nameCode, packRatio, packLevel, bhxjsl, From e735cab2e7c87205106738c7c34913d5f7de0b29 Mon Sep 17 00:00:00 2001 From: 1178634255 <1178634255@qq.com> Date: Fri, 7 Jul 2023 15:32:33 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=AF=86=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/auth/AuthUserController.java | 28 +++++++++++--- .../purchase/SupManufacturerController.java | 1 + .../purchase/SupProductController.java | 1 + .../com/glxp/api/dao/auth/AuthAdminDao.java | 2 + .../glxp/api/req/auth/UpdateUserRequset.java | 37 +++++++++++++++++++ .../api/service/auth/AuthAdminService.java | 5 ++- .../auth/impl/AuthAdminServiceImpl.java | 9 ++++- .../mybatis/mapper/auth/AuthAdminDao.xml | 9 +++++ 8 files changed, 85 insertions(+), 7 deletions(-) create mode 100644 src/main/java/com/glxp/api/req/auth/UpdateUserRequset.java diff --git a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java index f015ee61..87d725e2 100644 --- a/src/main/java/com/glxp/api/controller/auth/AuthUserController.java +++ b/src/main/java/com/glxp/api/controller/auth/AuthUserController.java @@ -6,10 +6,7 @@ import com.glxp.api.annotation.Log; import com.glxp.api.constant.BusinessType; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.*; -import com.glxp.api.req.auth.AuthUserSaveRequest; -import com.glxp.api.req.auth.FilterInvLinkDataRequest; -import com.glxp.api.req.auth.FilterInvWarehouseRequest; -import com.glxp.api.req.auth.FilterNoSelectUserRequest; +import com.glxp.api.req.auth.*; import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; @@ -28,7 +25,8 @@ import java.util.*; */ @RestController public class AuthUserController extends BaseController { - + @Resource + CustomerService customerService; @Resource private AuthAdminService authAdminService; @Resource @@ -126,5 +124,25 @@ public class AuthUserController extends BaseController { List hospitalUserList = authAdminService.getHospitalUserList(); return ResultVOUtils.success(hospitalUserList); } + //修改用户信息 + @AuthRuleAnnotation("") + @PostMapping("/admin/auth/admin/updateUser") + public BaseResponse updateUser(@RequestBody UpdateUserRequset updateUserRequset) { + AuthAdmin authAdmin=customerService.getUserBean(); + System.out.println(updateUserRequset.toString()); + if (!updateUserRequset.getPassWord().equals(authAdmin.getPassWord())){ + return ResultVOUtils.error(500,"当前密码输入错误！请重新输入！"); + } + if (updateUserRequset.getNewPassword().equals(authAdmin.getPassWord())){ + return ResultVOUtils.error(500,"新密码与旧密码重复！请重新修改！"); + } + if (updateUserRequset.getNewPassword().equals(updateUserRequset.getConfirmPassword())&&updateUserRequset.getPassWord().equals(authAdmin.getPassWord())){ + authAdminService.updateUser(updateUserRequset); + return ResultVOUtils.success("修改成功"); + }else { + return ResultVOUtils.error(500,"新密码与确认密码不相同！请重新修改！"); + } + + } } diff --git a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java index d31a427d..300927b1 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupManufacturerController.java @@ -68,6 +68,7 @@ public class SupManufacturerController { return ResultVOUtils.error(500, "企业信息为空"); } + //点击配送企业跳出生产企业信息 @AuthRuleAnnotation("") @GetMapping("/sup/manufacturer/getCompanyList") public BaseResponse getCompanyList(FilterSupManufacturerRequest filterSupManufacturerRequest) { diff --git a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java index 0e062fb5..f590d5eb 100644 --- a/src/main/java/com/glxp/api/controller/purchase/SupProductController.java +++ b/src/main/java/com/glxp/api/controller/purchase/SupProductController.java @@ -75,6 +75,7 @@ public class SupProductController { return ResultVOUtils.error(500, "企业信息为空"); } + //点击生产企业跳出物资信息 @AuthRuleAnnotation("") @GetMapping("/sup/product/getRegistrationList") public BaseResponse getRegistrationList(FilterPoductRequest filterPoductRequest) { diff --git a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java index a2384776..7b5d7dd8 100644 --- a/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java +++ b/src/main/java/com/glxp/api/dao/auth/AuthAdminDao.java @@ -5,6 +5,7 @@ import com.glxp.api.dao.inout.IoCodeTempDao; import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.inout.IoCodeTempEntity; import com.glxp.api.req.auth.FilterAuthUserRequest; +import com.glxp.api.req.auth.UpdateUserRequset; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -90,4 +91,5 @@ public interface AuthAdminDao extends BaseMapperPlus findByCustomerId(@Param("CustomerId") String customerId); + boolean updateUser(UpdateUserRequset updateUserRequset); } diff --git a/src/main/java/com/glxp/api/req/auth/UpdateUserRequset.java b/src/main/java/com/glxp/api/req/auth/UpdateUserRequset.java new file mode 100644 index 00000000..2fe54c36 --- /dev/null +++ b/src/main/java/com/glxp/api/req/auth/UpdateUserRequset.java @@ -0,0 +1,37 @@ +package com.glxp.api.req.auth; + +import com.glxp.api.entity.auth.SysRole; +import lombok.Data; + +import java.util.Date; +import java.util.List; + +@Data +public class UpdateUserRequset { + // 主键 + private Long id; + private String userName; + // 登录密码 + private String passWord; + private String newPassword; + private String confirmPassword; + // 最后登录ip + private String lastLoginIp; + // 最后登录时间 + private Date lastLoginTime; + // 创建时间 + private Date createTime; + // 状态 + private Integer userFlag; + private Date lastModifyTime; + private String comments; + private String employeeName; + private Long CustomerId; + private String locDeptCode; + private String locInvCode; + private String deptName; + private List roles; + private Long[] roleIds; + + +} diff --git a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java index ee75cac4..8a0f3093 100644 --- a/src/main/java/com/glxp/api/service/auth/AuthAdminService.java +++ b/src/main/java/com/glxp/api/service/auth/AuthAdminService.java @@ -5,6 +5,7 @@ import com.glxp.api.entity.auth.AuthAdmin; import com.glxp.api.entity.auth.SysUserRole; import com.glxp.api.req.auth.FilterAuthUserRequest; import com.glxp.api.req.auth.FilterNoSelectUserRequest; +import com.glxp.api.req.auth.UpdateUserRequset; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -30,7 +31,7 @@ public interface AuthAdminService { boolean deleteById(Long id); int deleteByCustomerId(String customerId); - + boolean updateUser(UpdateUserRequset updateUserRequset); /** * 获取医院用户列表 * @@ -53,4 +54,6 @@ public interface AuthAdminService { List findByCustomerId(String customerId); SysUserRole selectByAuthId(Long id); + + } diff --git a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java index 22ea3c3f..98905ca8 100644 --- a/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java +++ b/src/main/java/com/glxp/api/service/auth/impl/AuthAdminServiceImpl.java @@ -12,6 +12,7 @@ import com.glxp.api.exception.JsonException; import com.glxp.api.req.auth.FilterAuthUserRequest; import com.glxp.api.req.auth.FilterNoSelectUserRequest; import com.glxp.api.req.auth.FilterUserRoleRequest; +import com.glxp.api.req.auth.UpdateUserRequset; import com.glxp.api.service.auth.AuthAdminService; import com.glxp.api.common.enums.ResultEnum; import org.springframework.stereotype.Service; @@ -135,7 +136,13 @@ public class AuthAdminServiceImpl implements AuthAdminService { public int deleteByCustomerId(String customerId) { return authAdminDao.delete(new QueryWrapper().eq("CustomerId", customerId)); } - + @Override + public boolean updateUser(UpdateUserRequset updateUserRequset) { + if (updateUserRequset.getId() == null) { + return false; + } + return authAdminDao.updateUser(updateUserRequset); + } @Override public List getHospitalUserList() { //查询未被禁用的医院用户 diff --git a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml index ca9ebd5b..cb73d38b 100644 --- a/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml +++ b/src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml @@ -244,6 +244,15 @@ + + UPDATE auth_user + + + passWord=#{newPassword}, + + + WHERE id = #{id} + - SELECT ic.* + SELECT + ic.id, + ic.orderIdFk, + ic.bindRlFk, + ic.batchNo, + ic.productDate, + ic.expireDate, + ic.machineNo, + ic.invoiceCode, + ic.invoiceEncode, + ic.invoiceDate, + ic.updateTime, + ic.createUser, + ic.createTime, + ic.updateUser, + ic.remark, + ic.licenseUrl, + ic.bizIdFk, + io.coName, + ic.price, + io.spec, + bp.measname, + io.manufacturer, + io.certCode, + io.reCount, + io.count FROM io_order_invoice ic - inner join io_order io on ic.orderIdFk = io.billNo + INNER JOIN io_order_detail_code io ON ic.orderIdFk = io.orderIdFk LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk LEFT JOIN basic_products bp ON bu.uuid = bp.uuid + + + AND ic.invoiceCode = #{invoiceCode} + + + AND ic.machineNo = #{machineNo} + + + AND date_format(ic.invoiceDate, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') + + + AND ic.invoiceEncode = #{invoiceEncode} + + + GROUP BY ic.invoiceEncode + order by ic.updateTime desc + + + + + +