Merge branch 'dev' into test

src/main/java/com/glxp/api/config/ReplaceBatch.java

@@ -42,11 +42,11 @@ public class ReplaceBatch extends AbstractMethod {
         CustomerSqlMethod sqlMethod = CustomerSqlMethod.REPLACE_ONE;
         List<TableFieldInfo> fieldList = tableInfo.getFieldList();
 
-        String columnScript = SqlScriptUtils.convertTrim(tableInfo.getAllInsertSqlColumnMaybeIf(null),
+//        String columnScript = SqlScriptUtils.convertTrim(tableInfo.getAllInsertSqlColumnMaybeIf(null),
-                LEFT_BRACKET, RIGHT_BRACKET, null, COMMA);
+//                LEFT_BRACKET, RIGHT_BRACKET, null, COMMA);
-//        String insertSqlColumn = tableInfo.getKeyInsertSqlColumn(true, true) +
+        String insertSqlColumn = tableInfo.getKeyInsertSqlColumn(true, true) +
-//                this.filterTableFieldInfo(fieldList, predicate, TableFieldInfo::getInsertSqlColumn, EMPTY);
+                this.filterTableFieldInfo(fieldList, predicate, TableFieldInfo::getInsertSqlColumn, EMPTY);
-//        String columnScript = LEFT_BRACKET + insertSqlColumn.substring(0, insertSqlColumn.length() - 1) + RIGHT_BRACKET;
+        String columnScript = LEFT_BRACKET + insertSqlColumn.substring(0, insertSqlColumn.length() - 1) + RIGHT_BRACKET;
         String insertSqlProperty = tableInfo.getKeyInsertSqlProperty(true, ENTITY_DOT, true) +
                 this.filterTableFieldInfo(fieldList, predicate, i -> i.getInsertSqlProperty(ENTITY_DOT), EMPTY);
         insertSqlProperty = LEFT_BRACKET + insertSqlProperty.substring(0, insertSqlProperty.length() - 1) + RIGHT_BRACKET;

src/main/java/com/glxp/api/controller/auth/AuthUserController.java

@@ -6,15 +6,13 @@ 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.*;
-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.res.PageSimpleResponse;
 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.service.auth.*;
+import com.glxp.api.util.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
@@ -28,7 +26,8 @@ import java.util.*;
  */
 @RestController
 public class AuthUserController extends BaseController {
-
+    @Resource
+    CustomerService customerService;
     @Resource
     private AuthAdminService authAdminService;
     @Resource
@@ -126,5 +125,31 @@ public class AuthUserController extends BaseController {
         List<AuthAdmin> 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 (StringUtils.isBlank(updateUserRequset.getNewPassword())){
+            return ResultVOUtils.error(500,"请输入新密码！");
+        }
+        if (StringUtils.isBlank(updateUserRequset.getConfirmPassword())){
+            return ResultVOUtils.error(500,"请输入确认密码！");
+        }
+        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,"新密码与确认密码不相同！请重新修改！");
+        }
+
+    }
 
 }

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

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.Log;
@@ -80,6 +81,7 @@ public class IoOrderController extends BaseController {
     @Resource
     IoOrderInvoiceService orderInvoiceService;
 
+
     /**
      * 查询单据列表
      *
@@ -784,4 +786,68 @@ public class IoOrderController extends BaseController {
         return ResultVOUtils.success();
     }
 
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/inout/order/filterInvoiceList")
+    public BaseResponse filterInvoiceList(FilterOrderRequest filterOrderRequest) {
+
+        //这个不等于空表示要查询发票对应的单据
+        if (filterOrderRequest.getInvoiceEncode() != null) {
+            //查询发票详情
+            QueryWrapper<IoOrderInvoiceEntity> ew=new QueryWrapper<IoOrderInvoiceEntity>();
+            ew.eq("invoiceEncode",filterOrderRequest.getInvoiceEncode());
+            List<IoOrderInvoiceEntity> ioOrderInvoiceEntity = orderInvoiceService.list(ew);
+            List<String> orderIds = ioOrderInvoiceEntity.stream().map(IoOrderInvoiceEntity::getOrderIdFk).collect(Collectors.toList());
+            filterOrderRequest.setOrderIds(orderIds);
+        }
+
+
+        if (StrUtil.isNotBlank(filterOrderRequest.getStatusType())) {
+            orderService.setFilterStatus(filterOrderRequest);
+        }
+        if (StrUtil.isNotBlank(filterOrderRequest.getVueType())) {
+            orderService.setActions(filterOrderRequest);
+        }
+
+        if (StrUtil.isNotEmpty(filterOrderRequest.getSupInoivceSearch())) {
+            orderService.setInvoiceFiltes(filterOrderRequest);
+        }
+        if (filterOrderRequest.getSourceLocalType() != null) {
+            if (filterOrderRequest.getSourceLocalType() == 1) {
+                filterOrderRequest.setSourceTypes(Arrays.asList(1, 2, 3, 4, 5));
+            } else {
+                filterOrderRequest.setSourceTypes(Arrays.asList(6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17));
+            }
+        }
+        String customerId = getCustomerId();
+        if (!customerId.equals("110")) {
+            filterOrderRequest.setFromCorp(customerId);
+        }
+        List<IoOrderResponse> list = orderService.getfilterOrderList(filterOrderRequest);
+
+        for (IoOrderResponse ioOrderResponse : list) {
+            if (ioOrderResponse.getCheckStatus() == null) {
+                ioOrderResponse.setCheckStatus(0 + "");
+            }
+            orderInvoiceService.findRegStausByBillNo(ioOrderResponse);
+        }
+        if (filterOrderRequest.getInvoiceEncode() == null) {
+            //查询已被登记的单据
+            List<IoOrderInvoiceEntity> ioOrderInvoiceEntity = orderInvoiceService.list();
+            //已被选择的单据做标记
+            if (ioOrderInvoiceEntity != null && ioOrderInvoiceEntity.size() > 0) {
+                for (IoOrderResponse ioOrderResponse : list) {
+                    for (IoOrderInvoiceEntity orderInvoiceEntity : ioOrderInvoiceEntity) {
+                        if (ioOrderResponse.getBillNo().equals(orderInvoiceEntity.getOrderIdFk())) {
+                            ioOrderResponse.setCheckType(true);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+        PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(list);
+        return ResultVOUtils.page(pageInfo);
+    }
+
+
 }

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

@@ -252,7 +252,9 @@ public class IoOrderDetailResultController extends BaseController {
             i++;
         }
 
-        String param = JSON.toJSONString(list);
+
+        data.put("data", list);
+        String param = JSON.toJSONString(data);
         JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
         return ResultVOUtils.success();
     }

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

@@ -1,6 +1,7 @@
 package com.glxp.api.controller.inout;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
@@ -9,15 +10,21 @@ import com.glxp.api.annotation.Log;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
+import com.glxp.api.entity.auth.AuthAdmin;
+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.entity.inout.IoOrderInvoiceEntity;
+import com.glxp.api.req.inout.FilterOrderDetailCodeRequest;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
 import com.glxp.api.req.inout.RefreshInoiceRequest;
 import com.glxp.api.req.system.DeleteRequest;
+import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.res.inout.RefreshInoiceResponse;
+import com.glxp.api.service.auth.CustomerService;
+import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderDetailCodeService;
 import com.glxp.api.service.inout.impl.IoOrderInvoiceService;
 import org.springframework.beans.BeanUtils;
@@ -27,6 +34,9 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 @RestController
@@ -35,7 +45,10 @@ public class IoOrderInvoiceController {
     IoOrderInvoiceService ioOrderInvoiceService;
     @Resource
     IoOrderDetailCodeService orderDetailCodeService;
-
+    @Resource
+    CustomerService customerService;
+    @Resource
+    IoOrderDetailBizService orderDetailBizService;
 
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/inout/order/refrshInvoice")
@@ -64,13 +77,22 @@ public class IoOrderInvoiceController {
         return ResultVOUtils.page(pageInfo);
     }
 
+
     //发票对应产品信息汇总
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/inout/invoice/product/detail")
     public BaseResponse productDetail(IoOrderInvoiceRequest orderInvoiceRequest) {
         if (StrUtil.isEmpty(orderInvoiceRequest.getInvoiceEncode()))
             return ResultVOUtils.error(500, "发票编码不能为空！");
-        List<IoOrderInvoiceResponse> orderInvoiceEntities = ioOrderInvoiceService.filterGroupBy(orderInvoiceRequest);
+        List<IoOrderInvoiceResponse> orderInvoiceEntities = ioOrderInvoiceService.filterInvoice(orderInvoiceRequest);
+
+        //计算金额
+        for (IoOrderInvoiceResponse orderInvoiceEntity : orderInvoiceEntities) {
+            if (orderInvoiceEntity.getPrice() != null && orderInvoiceEntity.getReCount() != 0) {
+                orderInvoiceEntity.setAmout(new BigDecimal(orderInvoiceEntity.getPrice()).multiply(new BigDecimal(orderInvoiceEntity.getReCount())));
+            }
+        }
+
         PageInfo<IoOrderInvoiceResponse> pageInfo = new PageInfo<>(orderInvoiceEntities);
         return ResultVOUtils.page(pageInfo);
     }
@@ -80,6 +102,9 @@ public class IoOrderInvoiceController {
     @GetMapping("/udiwms/inout/invoice/order/detail")
     public BaseResponse orderDetail(IoOrderInvoiceRequest orderInvoiceRequest) {
         List<IoOrderResponse> orderInvoiceEntities = ioOrderInvoiceService.filterByInvoiceCode(orderInvoiceRequest);
+        for (IoOrderResponse orderInvoiceEntity : orderInvoiceEntities) {
+            ioOrderInvoiceService.findRegStausByBillNo(orderInvoiceEntity);
+        }
         PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(orderInvoiceEntities);
         return ResultVOUtils.page(pageInfo);
     }
@@ -98,5 +123,74 @@ public class IoOrderInvoiceController {
             return ResultVOUtils.error(500, "删除失败！");
     }
 
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/inout/invoice/saveInvoice")
+    @Log(title = "发票增加", businessType = BusinessType.INSERT)
+    public BaseResponse saveInvoice(@RequestBody IoOrderInvoiceRequest ioOrderInvoiceRequest) {
+
+        List<String> orderFkList = ioOrderInvoiceRequest.getOrderFkList();
+        List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList = new ArrayList<>();
+        for (String orderFk : orderFkList) {
+            //查询单据详情
+            FilterOrderDetailCodeRequest orderDetailBizRequest = new FilterOrderDetailCodeRequest();
+            orderDetailBizRequest.setOrderIdFk(orderFk);
+            List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterOrderList(orderDetailBizRequest);
+            for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
+                IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();
+                BeanUtils.copyProperties(ioOrderInvoiceRequest, ioOrderInvoiceEntity);
+                ioOrderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());
+                ioOrderInvoiceEntity.setOrderIdFk(orderFk);
+                ioOrderInvoiceEntity.setUpdateTime(new Date());
+                ioOrderInvoiceEntity.setCreateTime(new Date());
+                ioOrderInvoiceEntity.setCreateUser(customerService.getUserId() + "");
+                ioOrderInvoiceEntity.setUpdateUser(customerService.getUserId() + "");
+                ioOrderInvoiceEntity.setBindRlFk(ioOrderDetailCodeRespons.getBindRlFk() + "");
+                ioOrderInvoiceEntity.setBatchNo(ioOrderDetailCodeRespons.getBatchNo());
+                ioOrderInvoiceEntity.setProductDate(ioOrderDetailCodeRespons.getProductDate());
+                ioOrderInvoiceEntity.setExpireDate(ioOrderDetailCodeRespons.getExpireDate());
+                ioOrderInvoiceEntityList.add(ioOrderInvoiceEntity);
+            }
+        }
+
+        boolean b = ioOrderInvoiceService.saveBatch(ioOrderInvoiceEntityList);
+        if (b)
+            return ResultVOUtils.success("选入成功！");
+        else
+            return ResultVOUtils.error(500, "选入失败！");
+    }
+
+
+    @PostMapping("/udiwms/inout/invoice/uploadInvoice")
+    @Log(title = "发票管理", businessType = BusinessType.UPDATE)
+    public BaseResponse uploadInvoice(@RequestBody IoOrderInvoiceEntity ioOrderInvoice) {
 
+        List<IoOrderInvoiceEntity> ioOrderInvoiceEntityList=ioOrderInvoiceService.list(new QueryWrapper<IoOrderInvoiceEntity>().eq("invoiceEncode",ioOrderInvoice.getInvoiceEncode()));
+        for (IoOrderInvoiceEntity ioOrderInvoiceEntity : ioOrderInvoiceEntityList) {
+            ioOrderInvoiceEntity.setInvoiceDate(ioOrderInvoice.getInvoiceDate());
+            ioOrderInvoiceEntity.setPrice(ioOrderInvoice.getPrice());
+            ioOrderInvoiceEntity.setLicenseUrl(ioOrderInvoice.getLicenseUrl());
+            ioOrderInvoiceEntity.setRemark(ioOrderInvoice.getRemark());
+            ioOrderInvoiceEntity.setMachineNo(ioOrderInvoice.getMachineNo());
+            ioOrderInvoiceEntity.setInvoiceCode(ioOrderInvoice.getInvoiceCode());
+            ioOrderInvoiceEntity.setUpdateTime(new Date());
+        }
+        ioOrderInvoiceService.updateBatchById(ioOrderInvoiceEntityList);
+
+        return ResultVOUtils.success("成功");
+
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/inout/invoice/deleteInvoiceByOrderFk")
+    @Log(title = "发票删除", businessType = BusinessType.DELETE)
+    public BaseResponse deleteInvoiceByOrderFk(@RequestBody DeleteRequest deleteRequest) {
+        if (StrUtil.isEmpty(deleteRequest.getInvoiceEncode()))
+            return ResultVOUtils.error(500, "发票编码不能为空");
+
+        boolean b = ioOrderInvoiceService.remove(new QueryWrapper<IoOrderInvoiceEntity>().eq("invoiceEncode", deleteRequest.getInvoiceEncode()).eq("orderIdFk",deleteRequest.getBillNo()));
+        if (b)
+            return ResultVOUtils.success("删除成功！");
+        else
+            return ResultVOUtils.error(500, "删除失败！");
+    }
 }

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) {

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) {

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<IoOrderDetailBizEntity> orderDetailBizEntities = syncDataResponse.getOrderDetailBizEntities();
+                        for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
+                            if (bizEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
+                                orderDetailBizDao.insertOrUpdate(bizEntity);
+                            }
+                        }
+                    }
+
+                    //更新码详情
+                    if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailCodeEntities())) {
+                        List<IoOrderDetailCodeEntity> orderDetailCodeEntities = syncDataResponse.getOrderDetailCodeEntities();
+                        for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {
+                            if (codeEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
+                                orderDetailCodeDao.insertOrUpdate(codeEntity);
+                            }
+                        }
+                    }
                 }
             }
 

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<AuthAdminDao, AuthAdmin, Au
     List<AuthAdmin> findByCustomerId(@Param("CustomerId") String customerId);
 
 
+    boolean updateUser(UpdateUserRequset updateUserRequset);
 }

src/main/java/com/glxp/api/dao/inout/IoOrderInvoiceMapper.java

@@ -19,6 +19,8 @@ public interface IoOrderInvoiceMapper extends BaseMapperPlus<IoOrderInvoiceMappe
 
     List<IoOrderInvoiceResponse> filterGroupBy(IoOrderInvoiceRequest orderInvoiceRequest);
 
+    List<IoOrderInvoiceResponse> filterInvoice(IoOrderInvoiceRequest orderInvoiceRequest);
+
 
     List<IoOrderResponse> filterByInvoiceCode(IoOrderInvoiceRequest orderInvoiceRequest);
 }

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;
 

src/main/java/com/glxp/api/req/auth/FilterAuthUserRequest.java

@@ -11,6 +11,7 @@ import java.util.List;
 public class FilterAuthUserRequest extends ListPageRequest {
 
     private String userName;
+    private String deptName;
 
     private Integer userFlag;
 

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<SysRole> roles;
+    private Long[] roleIds;
+
+
+}

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

@@ -190,4 +190,6 @@ public class FilterOrderRequest extends ListPageRequest {
     private List<String> invoiceActions2;
     private String orderBy;
 
+    private String invoiceEncode;
+
 }

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<IoOrderDetailCodeEntity> list;
     private String key;
 

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

@@ -70,6 +70,18 @@ public class IoOrderInvoiceRequest extends ListPageRequest {
 
     private Long bizIdFk;
 
+    List<String> orderFkList;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
     public static final String COL_ID = "id";
 
     public static final String COL_ORDERIDFK = "orderIdFk";

src/main/java/com/glxp/api/res/inout/IoOrderInvoiceResponse.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.Date;
 
 @Data
@@ -88,6 +89,16 @@ public class IoOrderInvoiceResponse {
     private Long bizIdFk;
 
 
+    private String coName;
+    private String spec;
+    private String measname;
+    private String manufacturer;
+    private String certCode;
+    private int reCount;
+    private int count;
+    private BigDecimal amout;
+
+
     public static final String COL_ID = "id";
 
     public static final String COL_ORDERIDFK = "orderIdFk";

src/main/java/com/glxp/api/res/inout/IoOrderResponse.java

@@ -255,6 +255,9 @@ public class IoOrderResponse {
     private int invoiceStatus;//发票登记状态0：未登记，1：未全部登记；2：已全部登记
 
 
+    private boolean checkType;
+
+
     public String getFromName() {
 
 

src/main/java/com/glxp/api/res/thrsys/ThrBusTypeOriginResponse.java

@@ -16,7 +16,7 @@ public class ThrBusTypeOriginResponse {
     /**
      * id
      */
-    private Integer id;
+    private Long id;
 
     /**
      * 单据类型名称

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<AuthAdmin> findByCustomerId(String customerId);
 
     SysUserRole selectByAuthId(Long id);
+
+
 }

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<AuthAdmin>().eq("CustomerId", customerId));
     }
-
+    @Override
+    public boolean updateUser(UpdateUserRequset updateUserRequset) {
+        if (updateUserRequset.getId() == null) {
+            return false;
+        }
+        return authAdminDao.updateUser(updateUserRequset);
+    }
     @Override
     public List<AuthAdmin> getHospitalUserList() {
         //查询未被禁用的医院用户

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.*;
-import com.glxp.api.util.GennerOrderUtils;
-import com.glxp.api.util.JasperUtils;
-import com.glxp.api.util.OrderNoTypeBean;
 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) {    //按单退货
 

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

@@ -117,6 +117,14 @@ public class IoOrderInvoiceService extends ServiceImpl<IoOrderInvoiceMapper, IoO
         return ioOrderInvoiceMapper.filterGroupBy(orderInvoiceRequest);
     }
 
+    public List<IoOrderInvoiceResponse> filterInvoice(IoOrderInvoiceRequest orderInvoiceRequest) {
+        if (orderInvoiceRequest.getPage() != null) {
+            int offset = (orderInvoiceRequest.getPage() - 1) * orderInvoiceRequest.getLimit();
+            PageHelper.offsetPage(offset, orderInvoiceRequest.getLimit());
+        }
+        return ioOrderInvoiceMapper.filterInvoice(orderInvoiceRequest);
+    }
+
 
     public List<IoOrderResponse> filterByInvoiceCode(IoOrderInvoiceRequest orderInvoiceRequest) {
         if (orderInvoiceRequest.getPage() != null) {

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

@@ -585,8 +585,14 @@ public class IoOrderServiceImpl implements IoOrderService {
                 IoOrderResponse response = new IoOrderResponse();
                 BeanUtil.copyProperties(orderEntity, response);
                 if (orderEntity.getStatus().equals(ConstantStatus.ORDER_STATUS_AUDITED) && checkBusTypeSupplementOrder(orderEntity)
-                        && StrUtil.isEmpty(orderEntity.getSupplementNo())) {
+                        && StrUtil.isEmpty(orderEntity.getSupplementNo())
-                    response.setEnableSupplementOrder(true);
+                ) {
+                    if (orderEntity.getFromType() == ConstantStatus.FROM_UDISP) {
+                        if (orderEntity.getOutChangeEnable()) {
+                            response.setEnableSupplementOrder(true);
+                        }
+                    } else
+                        response.setEnableSupplementOrder(true);
                 }
                 result.add(response);
             } catch (Exception e) {

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

src/main/resources/mybatis/mapper/auth/AuthAdminDao.xml

@@ -21,6 +21,9 @@
             <if test="userName != null and '' != userName">
                 AND userName LIKE CONCAT('%', #{userName}, '%')
             </if>
+            <if test="deptName != null and '' != deptName">
+                AND auth_dept.name LIKE CONCAT('%', #{deptName}, '%')
+            </if>
             <if test="neUserName != null and '' != neUserName">
                 AND userName != #{neUserName}
             </if>
@@ -244,6 +247,15 @@
         </where>
     </select>
 
+    <update id="updateUser" parameterType="com.glxp.api.req.auth.UpdateUserRequset">
+        UPDATE auth_user
+        <set>
+            <if test="passWord != null">
+                passWord=#{newPassword},
+            </if>
+        </set>
+        WHERE id = #{id}
+    </update>
     <select id="findByCustomerId" parameterType="hashmap" resultType="com.glxp.api.entity.auth.AuthAdmin">
         SELECT *
         FROM auth_user

src/main/resources/mybatis/mapper/basic/ProductInfoDao.xml

@@ -412,7 +412,7 @@
     </select>
 
 
-    <insert id="insertProductInfo" keyProperty="id"
+    <insert id="insertProductInfo"
             parameterType="com.glxp.api.entity.basic.ProductInfoEntity">
         REPLACE
                 INTO productinfo
@@ -476,7 +476,7 @@
     </insert>
 
 
-    <insert id="insertProductInfos" keyProperty="id"
+    <insert id="insertProductInfos"
             parameterType="com.glxp.api.entity.basic.ProductInfoEntity">
         REPLACE INTO productinfo
                 (id, nameCode, packRatio, packLevel, bhxjsl,

src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml

@@ -37,12 +37,89 @@
 
     <select id="filterGroupBy" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
             resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
-        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
+        <where>
+            <if test="invoiceCode != null and invoiceCode != ''">
+                AND ic.invoiceCode = #{invoiceCode}
+            </if>
+            <if test="machineNo != null and invoiceCode != ''">
+                AND ic.machineNo = #{machineNo}
+            </if>
+            <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+                AND date_format(ic.invoiceDate, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
+            </if>
+            <if test="invoiceEncode != null and invoiceEncode != ''">
+                AND ic.invoiceEncode = #{invoiceEncode}
+            </if>
+        </where>
+        GROUP BY ic.invoiceEncode
+        order by ic.updateTime desc
+    </select>
+
+
+    <select id="filterInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
+            resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
+        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,
+        io.price,
+        io.spec,
+        bp.measname,
+        io.manufacturer,
+        io.certCode,
+        io.reCount,
+        io.count
+        FROM io_order_invoice ic
+        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
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND ic.orderIdFk = #{orderIdFk}
@@ -53,9 +130,15 @@
             <if test="batchNo != null and batchNo != ''">
                 AND ic.batchNo = #{batchNo}
             </if>
+            <if test="invoiceEncode != null and invoiceEncode != ''">
+                AND ic.invoiceEncode = #{invoiceEncode}
+            </if>
         </where>
-        GROUP BY ic.invoiceEncode
+        GROUP BY io.orderIdFk
+        order by ic.updateTime desc
     </select>
+
+
     <select id="filterByInvoiceCode" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
             resultType="com.glxp.api.res.inout.IoOrderResponse">
         select io.*,