Merge remote-tracking branch 'origin/dev' into dev

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

@@ -28,6 +28,7 @@ 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.*;
+import com.glxp.api.vo.inv.InvWarehouseTreeVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -316,7 +317,7 @@ public class LoginController extends BaseController {
         return ResultVOUtils.error(ResultEnum.DATA_CHANGE);
     }
 
-    //------------------------------------------UDIMS接口-----------------------------------------------------------
+
 
     @Autowired
     private InvWarehouseDao invWarehouseDao;
@@ -366,7 +367,6 @@ public class LoginController extends BaseController {
         return ResultVOUtils.success(authLicense1);
     }
 
-
     @GetMapping("/spms/inv/warehouse/filterInv/forUdims")
     public BaseResponse forUdims() {
         FilterInvWarehouseRequest filterInvWarehouseRequest=new FilterInvWarehouseRequest();
@@ -397,9 +397,6 @@ public class LoginController extends BaseController {
     }
 
 
-
-
-
     @Value("${WEB_TITLE}")
     private String WEB_TITLE;
 
@@ -410,4 +407,53 @@ public class LoginController extends BaseController {
         return ResultVOUtils.success(webTitleResponse);
     }
 
+
+
+    //------------------------------------------UDIMS接口-----------------------------------------------------------
+    /**
+     * 平台验证
+     *
+     * @return
+     */
+    @ResponseBody
+    @PostMapping(value = "/udims/verify")
+    public BaseResponse udimsVerify(@RequestBody Map<String, Object> params,
+                                    HttpServletRequest request) {
+        AuthAdmin authAdmin;
+        authAdmin = authAdminService.findByUserName(params.get("username").toString());
+        if (authAdmin == null) {
+            throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
+        }
+
+
+        if (!PasswordUtils.authAdminPwd(params.get("password").toString()).equals(authAdmin.getPassWord())) {
+            throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
+        }
+        AuthLicense authLicense = new AuthLicense();
+        if (params.get("appid") != null) {
+            authLicense = authLicenseDao.get(params.get("appid").toString());
+        } else {
+            String appid = AppUtils.getAppid();
+            authLicense.setId(appid);
+            authLicense.setAppid(appid);
+            authLicense.setApiKey(appid);
+            if (params.get("name") != null)
+                authLicense.setName(params.get("name").toString());
+            authLicense.setSecretKey(AppUtils.getSecretKey(appid));
+            authLicense.setCustomerId(authAdmin.getCustomerId() + "");
+            CompanyEntity companyEntity = companyService.findCompany(authAdmin.getCustomerId());
+            authLicense.setCompanyName(companyEntity.getCompanyName());
+            authLicense.setCreateDate(new Date());
+            authLicenseDao.romveByCustomerId(authAdmin.getCustomerId() + "");
+            authLicenseDao.save(authLicense);
+        }
+        FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
+        filterInvWarehouseRequest.setSpUse(true);
+        List<InvWarehouseTreeVo> invList = invWarehouseDao.selectInvListTreeByUser(filterInvWarehouseRequest);
+        Map<String, Object> res = new WeakHashMap<>(2);
+        res.put("license", authLicense);
+        res.put("invList", invList);
+        return ResultVOUtils.success(res);
+    }
+
 }

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

@@ -35,6 +35,7 @@ import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.EntrustReceService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.*;
+import com.glxp.api.service.inout.impl.IoOrderInvoiceService;
 import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.OrderNoTypeBean;

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

@@ -41,6 +41,7 @@ import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.*;
 import com.glxp.api.service.inout.*;
+import com.glxp.api.service.inout.impl.IoOrderInvoiceService;
 import com.glxp.api.service.purchase.PurOrderDetailService;
 import com.glxp.api.service.purchase.PurOrderService;
 import com.glxp.api.service.purchase.SupCertService;

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

@@ -1,19 +1,27 @@
 package com.glxp.api.controller.inout;
 
 import cn.hutool.core.collection.CollUtil;
+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;
 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.inout.IoOrderDetailCodeEntity;
+import com.glxp.api.entity.inout.IoOrderEntity;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 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.IoOrderInvoiceResponse;
+import com.glxp.api.res.inout.IoOrderResponse;
 import com.glxp.api.res.inout.RefreshInoiceResponse;
 import com.glxp.api.service.inout.IoOrderDetailCodeService;
-import com.glxp.api.service.inout.IoOrderInvoiceService;
+import com.glxp.api.service.inout.impl.IoOrderInvoiceService;
 import org.springframework.beans.BeanUtils;
+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;
@@ -46,4 +54,49 @@ public class IoOrderInvoiceController {
             return ResultVOUtils.error(500, "查无发票信息！");
         return ResultVOUtils.success(response);
     }
+
+    //分组查询发票列表
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/inout/order/group/invoice")
+    public BaseResponse filterGroup(IoOrderInvoiceRequest orderInvoiceRequest) {
+        List<IoOrderInvoiceResponse> orderInvoiceEntities = ioOrderInvoiceService.filterGroupBy(orderInvoiceRequest);
+        PageInfo<IoOrderInvoiceResponse> pageInfo = new PageInfo<>(orderInvoiceEntities);
+        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);
+        PageInfo<IoOrderInvoiceResponse> pageInfo = new PageInfo<>(orderInvoiceEntities);
+        return ResultVOUtils.page(pageInfo);
+    }
+
+    //发票对应所有单据
+    @AuthRuleAnnotation("")
+    @GetMapping("/udiwms/inout/invoice/order/detail")
+    public BaseResponse orderDetail(IoOrderInvoiceRequest orderInvoiceRequest) {
+        List<IoOrderResponse> orderInvoiceEntities = ioOrderInvoiceService.filterByInvoiceCode(orderInvoiceRequest);
+        PageInfo<IoOrderResponse> pageInfo = new PageInfo<>(orderInvoiceEntities);
+        return ResultVOUtils.page(pageInfo);
+    }
+
+    @AuthRuleAnnotation("")
+    @PostMapping("/udiwms/inout/invoice/delete")
+    @Log(title = "发票删除", businessType = BusinessType.DELETE)
+    public BaseResponse deleteInvoice(@RequestBody DeleteRequest deleteRequest) {
+        if (StrUtil.isEmpty(deleteRequest.getInvoiceEncode()))
+            return ResultVOUtils.error(500, "发票编码不能为空");
+
+        boolean b = ioOrderInvoiceService.remove(new QueryWrapper<IoOrderInvoiceEntity>().eq("invoiceEncode", deleteRequest.getInvoiceEncode()));
+        if (b)
+            return ResultVOUtils.success("删除成功！");
+        else
+            return ResultVOUtils.error(500, "删除失败！");
+    }
+
+
 }

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/inout/IoOrderInvoiceMapper.java

@@ -4,6 +4,8 @@ package com.glxp.api.dao.inout;
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
+import com.glxp.api.res.inout.IoOrderInvoiceResponse;
+import com.glxp.api.res.inout.IoOrderResponse;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -15,4 +17,8 @@ public interface IoOrderInvoiceMapper extends BaseMapperPlus<IoOrderInvoiceMappe
 
     List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceEntity);
 
+    List<IoOrderInvoiceResponse> filterGroupBy(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/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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.entity.purchase.SupCertSetEntity;
+import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
 import java.util.Date;
@@ -17,7 +18,7 @@ import java.util.List;
  * @modyified By :
  */
 @Data
-public class IoOrderInvoiceRequest {
+public class IoOrderInvoiceRequest extends ListPageRequest {
 
     private Long id;
 

src/main/java/com/glxp/api/req/system/DeleteRequest.java

@@ -11,4 +11,5 @@ public class DeleteRequest {
     List<String> ids;
     String billNo;
     List<String> billNos;
+    String invoiceEncode;
 }

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

@@ -9,7 +9,6 @@ import lombok.Data;
 import java.util.Date;
 
 @Data
-@TableName(value = "io_order_invoice")
 public class IoOrderInvoiceResponse {
     private Long id;
 

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/inout/IoChangeInoutService.java

@@ -16,6 +16,7 @@ import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.IBasicBusTypePreService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
+import com.glxp.api.service.inout.impl.IoOrderInvoiceService;
 import com.glxp.api.service.inv.InvProductDetailService;
 import com.glxp.api.service.inv.InvProductService;
 import com.glxp.api.service.system.SystemParamConfigService;

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

@@ -22,13 +22,11 @@ import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
+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;
@@ -303,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());
@@ -855,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/IoOrderInvoiceService.java

@@ -1,31 +0,0 @@
-package com.glxp.api.service.inout;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.glxp.api.entity.inout.IoCodeRelEntity;
-import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
-import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
-import com.glxp.api.req.inout.IoOrderInvoiceRequest;
-import com.glxp.api.res.inout.IoOrderResponse;
-
-import java.util.List;
-
-public interface IoOrderInvoiceService extends IService<IoOrderInvoiceEntity> {
-
-
-    List<IoOrderInvoiceEntity> findByBillNo(String billNo);
-
-    boolean deleteByInvId(String id);
-
-    boolean updateByInvId(IoOrderInvoiceRequest ioOrderInvoiceRequest);
-
-    boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity);
-
-    List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceRequest);
-
-    // 更新发票状态
-    boolean updateRegStatus(IoOrderDetailCodeEntity orderDetailCodeEntity);
-
-    IoOrderResponse findRegStausByBillNo(IoOrderResponse orderResponse);
-
-    boolean findRegStausByProduct(String billNo);
-}

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

@@ -4,18 +4,18 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.glxp.api.dao.inout.IoCodeRelMapper;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.inout.IoOrderDetailCodeDao;
 import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
-import com.glxp.api.entity.inout.IoCodeRelEntity;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.req.inout.IoOrderInvoiceRequest;
+import com.glxp.api.res.inout.IoOrderInvoiceResponse;
 import com.glxp.api.res.inout.IoOrderResponse;
+import org.apache.regexp.RE;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
-import com.glxp.api.service.inout.IoOrderInvoiceService;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
@@ -25,24 +25,22 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class IoOrderInvoiceServiceImpl extends ServiceImpl<IoOrderInvoiceMapper, IoOrderInvoiceEntity> implements IoOrderInvoiceService {
+public class IoOrderInvoiceService extends ServiceImpl<IoOrderInvoiceMapper, IoOrderInvoiceEntity> {
     @Resource
     IoOrderInvoiceMapper ioOrderInvoiceMapper;
     @Resource
     IoOrderDetailCodeDao orderDetailCodeDao;
 
-    @Override
+
     public List<IoOrderInvoiceEntity> findByBillNo(String orderIdFk) {
         return ioOrderInvoiceMapper.selectList(new QueryWrapper<IoOrderInvoiceEntity>().eq("orderIdFk", orderIdFk));
     }
 
 
-    @Override
     public boolean deleteByInvId(String id) {
         return this.ioOrderInvoiceMapper.deleteById(id) > 0;
     }
 
-    @Override
     public boolean updateByInvId(IoOrderInvoiceRequest ioOrderInvoiceRequest) {
         IoOrderInvoiceEntity ioOrderInvoiceEntity = new IoOrderInvoiceEntity();
         BeanUtils.copyProperties(ioOrderInvoiceRequest, ioOrderInvoiceEntity);
@@ -50,32 +48,20 @@ public class IoOrderInvoiceServiceImpl extends ServiceImpl<IoOrderInvoiceMapper,
         return this.ioOrderInvoiceMapper.updateById(ioOrderInvoiceEntity) > 0;
     }
 
-    @Override
     public boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity) {
         return ioOrderInvoiceMapper.insert(ioOrderInvoiceEntity) > 0;
     }
 
-    @Override
     public List<IoOrderInvoiceEntity> selectOrderInvoice(IoOrderInvoiceRequest ioOrderInvoiceRequest) {
         return ioOrderInvoiceMapper.selectOrderInvoice(ioOrderInvoiceRequest);
     }
 
-    @Override
     public boolean updateRegStatus(IoOrderDetailCodeEntity orderDetailCodeEntity) {
         IoOrderInvoiceRequest orderInvoiceRequest = new IoOrderInvoiceRequest();
         orderInvoiceRequest.setBatchNo(orderDetailCodeEntity.getBatchNo());
         orderInvoiceRequest.setBindRlFk(orderDetailCodeEntity.getBindRlFk() + "");
         List<IoOrderInvoiceEntity> orderInvoiceEntities = selectOrderInvoice(orderInvoiceRequest);
         if (CollUtil.isNotEmpty(orderInvoiceEntities)) {
-//            BigDecimal amount = new BigDecimal(0.00);
-//            for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
-//                amount = amount.add(new BigDecimal(orderInvoiceEntity.getPrice()));
-//            }
-//            if (amount.compareTo(orderDetailCodeEntity.getPrice()) == 0) {
-//                orderDetailCodeEntity.setRegStatus(true);
-//            } else {
-//                orderDetailCodeEntity.setRegStatus(false);
-//            }
             orderDetailCodeEntity.setRegStatus(true);
         } else {
             orderDetailCodeEntity.setRegStatus(false);
@@ -84,7 +70,6 @@ public class IoOrderInvoiceServiceImpl extends ServiceImpl<IoOrderInvoiceMapper,
         return true;
     }
 
-    @Override
     public IoOrderResponse findRegStausByBillNo(IoOrderResponse orderResponse) {
         List<IoOrderInvoiceEntity> orderInvoiceEntities = ioOrderInvoiceMapper.selectList(new QueryWrapper<IoOrderInvoiceEntity>().eq("orderIdFk", orderResponse.getBillNo()));
         List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeDao.selectList(new QueryWrapper<IoOrderDetailCodeEntity>().eq("orderIdFk", orderResponse.getBillNo()));
@@ -113,15 +98,33 @@ public class IoOrderInvoiceServiceImpl extends ServiceImpl<IoOrderInvoiceMapper,
         }
         if (orderDetailCodeEntities.size() == isAll)
             orderResponse.setInvoiceStatus(2);//已全部登记
-        else if(isAll >0){
+        else if (isAll > 0) {
             orderResponse.setInvoiceStatus(1);//未全部登记
         }
         return orderResponse;
 
     }
 
-    @Override
     public boolean findRegStausByProduct(String billNo) {
         return false;
     }
+
+    public List<IoOrderInvoiceResponse> filterGroupBy(IoOrderInvoiceRequest orderInvoiceRequest) {
+        if (orderInvoiceRequest.getPage() != null) {
+            int offset = (orderInvoiceRequest.getPage() - 1) * orderInvoiceRequest.getLimit();
+            PageHelper.offsetPage(offset, orderInvoiceRequest.getLimit());
+        }
+        return ioOrderInvoiceMapper.filterGroupBy(orderInvoiceRequest);
+    }
+
+
+    public List<IoOrderResponse> filterByInvoiceCode(IoOrderInvoiceRequest orderInvoiceRequest) {
+        if (orderInvoiceRequest.getPage() != null) {
+            int offset = (orderInvoiceRequest.getPage() - 1) * orderInvoiceRequest.getLimit();
+            PageHelper.offsetPage(offset, orderInvoiceRequest.getLimit());
+        }
+        return ioOrderInvoiceMapper.filterByInvoiceCode(orderInvoiceRequest);
+    }
+
+
 }

src/main/java/com/glxp/api/service/sync/SpsSyncDownloadService.java

@@ -26,6 +26,7 @@ import com.glxp.api.res.sync.SpsSyncOrderResponse;
 import com.glxp.api.res.system.SyncDataSetResponse;
 import com.glxp.api.service.basic.*;
 import com.glxp.api.service.inout.*;
+import com.glxp.api.service.inout.impl.IoOrderInvoiceService;
 import com.glxp.api.service.purchase.*;
 import com.glxp.api.service.thrsys.IThrBusTypeOriginService;
 import com.glxp.api.util.CustomUtil;

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/InvWarehouseDao.xml

@@ -408,15 +408,14 @@
 
     <select id="selectInvListTreeByUser" resultMap="selectInvListTreeByUser">
         select auth_warehouse.`code`,
-               auth_warehouse.name warehouseName,
-               auth_warehouse.parentId,
-               auth_warehouse.parentCode,
-               auth_dept.code deptCode,
-               auth_dept.name deptName,
-               auth_warehouse.advanceType
+        auth_warehouse.name,
+        auth_warehouse.parentId,
+        auth_warehouse.parentCode,
+        auth_dept.name warehouseName,
+        auth_warehouse.advanceType
         from auth_warehouse
-                     inner join auth_dept on auth_warehouse.parentId = auth_dept.code
-                     LEFT join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
+        inner join auth_dept on auth_warehouse.parentId = auth_dept.code
+        LEFT join auth_warehouse_user on auth_warehouse.code = auth_warehouse_user.code
         <where>
             <if test="userId != null">
                 AND auth_warehouse_user.userId = #{userId}

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

@@ -12,11 +12,11 @@
 
     <select id="selectOrderInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
             resultType="com.glxp.api.entity.inout.IoOrderInvoiceEntity">
-        SELECT ic.*,bp.cpmctymc,bp.ggxh
+        SELECT ic.*, bp.cpmctymc, bp.ggxh
         FROM io_order_invoice ic
-        LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
-        LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
-        and bp.id >1
+                     LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
+                     LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
+                and bp.id > 1
         <where>
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND ic.orderIdFk = #{orderIdFk}
@@ -33,4 +33,55 @@
         </where>
         GROUP BY ic.id
     </select>
+
+
+    <select id="filterGroupBy" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
+            resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
+        SELECT ic.*
+        FROM io_order_invoice ic
+                     inner join io_order io on ic.orderIdFk = io.billNo
+                     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}
+            </if>
+            <if test="bindRlFk != null">
+                AND ic.bindRlFk = #{bindRlFk}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND ic.batchNo = #{batchNo}
+            </if>
+        </where>
+        GROUP BY ic.invoiceEncode
+    </select>
+    <select id="filterByInvoiceCode" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
+            resultType="com.glxp.api.res.inout.IoOrderResponse">
+        select io.*,
+               (select name from basic_bussiness_type bus where bus.action = io.action) billTypeName,
+               (select name from auth_dept ad where ad.code = io.deptCode)              deptName,
+               (select name from auth_warehouse aw where aw.code = io.invCode)          invName,
+               (select employeeName from auth_user au where au.id = io.createUser)      createUserName,
+               (select employeeName from auth_user au2 where au2.id = io.updateUser)    updateUserName,
+               (select employeeName from auth_user au3 where au3.id = io.reviewUser)    reviewUserName,
+               (select employeeName from auth_user au4 where au4.id = io.checkUser)     checkUserName,
+               (select name from auth_dept ad2 where ad2.code = io.fromDeptCode)        fromDeptName,
+               (select name from auth_warehouse aw2 where aw2.code = io.fromInvCode)    fromInvName,
+               (select name from basic_corp bc where bc.erpId = io.fromCorp)            fromCorpName,
+               (select name from basic_corp bc where bc.erpId = io.customerId)          customerName
+        from io_order as io
+                     inner join io_order_invoice ioi on io.billNo = ioi.orderIdFk
+        <where>
+            <if test="invoiceEncode != null">
+                AND ioi.invoiceEncode = #{invoiceEncode}
+            </if>
+        </where>
+        group by io.billNo;
+    </select>
+
+
+
+
+
 </mapper>