Merge branch 'dev' into test

src/main/java/com/glxp/api/controller/basic/BasicCorpExportLogController.java

@@ -39,7 +39,8 @@ public class BasicCorpExportLogController {
     @Resource
     private BasicCorpService basicUnitMaintainService;
     @Resource
-    private BasicGenJsonService basicGenJsonService;;
+    private BasicGenJsonService basicGenJsonService;
+    ;
 
     @GetMapping("/udiwms/corps/exportLog/filter")
     public BaseResponse filter(FilterCorpExportLogRequest filterCorpExportLogRequest,
@@ -110,14 +111,14 @@ public class BasicCorpExportLogController {
     public BaseResponse excelDownload(@RequestBody BasicCorpsExportRequest basicCorpsExportRequest) {
         String fileName = "D:\\udiwms\\exportFile\\" + "往来单位信息导出" + System.currentTimeMillis() + ".UpperIn";
         BasicCorpsExportLogEntity corpExportLogEntity = new BasicCorpsExportLogEntity();
-        List<Integer> ids=basicCorpsExportRequest.getIds();
+        List<Long> ids = basicCorpsExportRequest.getIds();
         corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS);
         String genKey = CustomUtil.getId();
         corpExportLogEntity.setGenKey(genKey);
         corpExportLogEntity.setFilePath(fileName);
         corpExportLogEntity.setUpdateTime(new Date());
         corpExportLogEntity.setDlCount(0);
-        corpExportLogEntity.setRemark("本次导出数据"+ids.size()+"条");
+        corpExportLogEntity.setRemark("本次导出数据" + ids.size() + "条");
         corpExportLogEntity.setType(BasicProcessStatus.EXPORT_JSON);
         basicCorpExportLogService.insertCorpExportLog(corpExportLogEntity);
         //basicGenExcelService.exportCorp(genKey, corpsExportRequest);

src/main/java/com/glxp/api/controller/basic/BasicGenExcelService.java

@@ -35,19 +35,22 @@ public class BasicGenExcelService {
     SyncDataSetService syncDataSetService;
     @Resource
     HttpOkClient httpOkClient;
-//
+
+    //
     public String getIpUrl() {
         SyncDataSetEntity syncDataSetEntity = syncDataSetService.findSet();
         return syncDataSetEntity.getSyncIp();
     }
-//
+
+    //
     @Resource
     BasicCorpExportLogService basicCorpExportLogService;
     @Resource
     BasicCorpService basicUnitMaintainService;
     @Resource
     BasicProductsExportLogService basicProductsExportLogService;
-//    @Resource
+
+    //    @Resource
 //    UdiRelevanceService udiRelevanceService;
 //    @Resource
 //    SystemParamConfigService systemParamConfigService;
@@ -81,8 +84,8 @@ public class BasicGenExcelService {
         excelData.add(head);
         //选中导出
         if (basicCorpsExportRequest.getIds() != null && basicCorpsExportRequest.getIds().size() > 0) {
-            List<Integer> ids = basicCorpsExportRequest.getIds();
+            List<Long> ids = basicCorpsExportRequest.getIds();
-            for (Integer id : ids) {
+            for (Long id : ids) {
                 BasicUnitMaintainFilterRequest filterRequest = new BasicUnitMaintainFilterRequest();
                 filterRequest.setId(id);
                 List<List<String>> genDatas = genExcelData(filterRequest);
@@ -114,7 +117,8 @@ public class BasicGenExcelService {
         corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS);
         basicCorpExportLogService.updateCorpExportLog(corpExportLogEntity);
     }
-//
+
+    //
 //    //上传往来单位SMP
 //    @Async
 //    public void uploadCorpSmp(String genKey, CorpsExportRequest corpsExportRequest) {
@@ -193,7 +197,8 @@ public class BasicGenExcelService {
         }
         basicCorpExportLogService.updateCorpExportLog(corpExportLogEntity);
     }
-//
+
+    //
 //
 //    @Async
 //    public void exportUdiInfo(String genKey, UdiInfoExportRequest udiInfoExportRequest) {
@@ -262,7 +267,8 @@ public class BasicGenExcelService {
         }
         basicProductsExportLogService.updateUdiInfoExportLog(basicProductsExportLogEntity);
     }
-//
+
+    //
 //
 //    @Async
 //    public void uploadProductsSmp(String genKey, UdiInfoExportRequest udiInfoExportRequest) {

src/main/java/com/glxp/api/controller/basic/BasicGenJsonService.java

@@ -64,7 +64,7 @@ public class BasicGenJsonService {
 
         List<BasicCorpEntity> unitMaintainEntities = new ArrayList<>();
         if (basicCorpsExportRequest.getIds() != null && basicCorpsExportRequest.getIds().size() > 0) {
-            List<Integer> ids = basicCorpsExportRequest.getIds();
+            List<Long> ids = basicCorpsExportRequest.getIds();
             ids.forEach(id -> {
                 BasicUnitMaintainFilterRequest request = new BasicUnitMaintainFilterRequest();
                 request.setId(id);
@@ -93,7 +93,7 @@ public class BasicGenJsonService {
         BasicCorpExportLogResponse exportData = new BasicCorpExportLogResponse();
         List<BasicCorpEntity> unitMaintainEntities = new ArrayList<>();
         if (corpsExportRequest.getIds() != null && corpsExportRequest.getIds().size() > 0) {
-            List<Integer> ids = corpsExportRequest.getIds();
+            List<Long> ids = corpsExportRequest.getIds();
             ids.forEach(id -> {
                 BasicUnitMaintainFilterRequest request = new BasicUnitMaintainFilterRequest();
                 request.setId(id);
@@ -114,6 +114,7 @@ public class BasicGenJsonService {
         return exportData;
     }
 //
+
     /**
      * 查询第三方往来单位信息
      *

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -15,10 +15,7 @@ import com.glxp.api.entity.basic.*;
 import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.entity.thrsys.ThrSystemEntity;
-import com.glxp.api.req.basic.FilterUdiRelRequest;
+import com.glxp.api.req.basic.*;
-import com.glxp.api.req.basic.LockUdiRequest;
-import com.glxp.api.req.basic.UdiCombineRequest;
-import com.glxp.api.req.basic.UdiRelevanceSaveRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.req.thrsys.FilterBasicThirdSysRequest;
 import com.glxp.api.res.PageSimpleResponse;
@@ -68,6 +65,8 @@ public class UdiRelevanceController extends BaseController {
     ThrDataService thrDataService;
     @Resource
     UdiRlSupService udiRlSupService;
+    @Resource
+    ProductInfoService productInfoService;
 
     //手持终端下载UDI产品信息
     @AuthRuleAnnotation("")
@@ -704,5 +703,17 @@ public class UdiRelevanceController extends BaseController {
         return ResultVOUtils.success(ggxhList);
     }
 
+    //国家库uuid获取产品
+    @PostMapping("/udi/udirel/selectOriginuuid")
+    @Log(title = "单据管理", businessType = BusinessType.INSERT)
+    public BaseResponse selectOriginuuid(@RequestBody ProductInfoFilterRequest productInfoFilterRequest, BindingResult bindingResult) {
+
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<ProductInfoEntity> udiProductEntities = productInfoService.findAll(productInfoFilterRequest);
+        return ResultVOUtils.success(udiProductEntities);
+    }
+
 
 }

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

@@ -138,12 +138,15 @@ public class IoOrderController extends BaseController {
         }
         List<IoOrderResponse> list = orderService.getfilterList(filterOrderRequest);
         for (IoOrderResponse ioOrderResponse : list) {
+            if(ioOrderResponse.getCheckStatus() == null){
+                ioOrderResponse.setCheckStatus(0+"");
+            }
             FilterOrderDetailCodeRequest filterOrderDetailCodeRequest = new FilterOrderDetailCodeRequest();
             filterOrderDetailCodeRequest.setOrderIdFk(ioOrderResponse.getBillNo());
             List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(filterOrderDetailCodeRequest);
             BigDecimal amount=new BigDecimal(0.00);
             for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
-                if(ioOrderDetailCodeRespons.getCount() != 0) {
+                if(ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice()!=null ) {
                     amount = amount.add(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
                 }
             }

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

@@ -478,8 +478,8 @@ public class IoOrderDetailBizController extends BaseController {
     @PostMapping("/udiwms/inout/order/delBizProduct")
     @Log(title = "单据管理", businessType = BusinessType.DELETE)
     public BaseResponse delBizProduct(@RequestBody DeleteRequest deleteRequest) {
-        IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(Integer.parseInt(deleteRequest.getId()));
+        IoOrderDetailBizEntity orderDetailBizEntity = orderDetailBizService.selectById(Long.parseLong(deleteRequest.getId()));
-        int result = orderDetailBizService.deleteById(Integer.parseInt(deleteRequest.getId()));
+        int result = orderDetailBizService.deleteById(Long.parseLong(deleteRequest.getId()));
         if (result > 0) {
             boolean r1 = orderDetailBizService.isExit(orderDetailBizEntity.getOrderIdFk());
             boolean r2 = orderDetailCodeService.isExit(orderDetailBizEntity.getOrderIdFk());
@@ -566,11 +566,11 @@ public class IoOrderDetailBizController extends BaseController {
 
         ioOrderDetailBizEntity.setOrderIdFk(ioOrderInvoiceEntity.getOrderIdFk());
 
-        ioOrderDetailBizEntity.setId(ioOrderInvoiceResponse.getBizIdFk().intValue());
+        ioOrderDetailBizEntity.setId(ioOrderInvoiceResponse.getBizIdFk().longValue());
 
-        ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId()+"");
+        ioOrderInvoiceService.deleteByInvId(ioOrderInvoiceEntity.getId() + "");
         List<IoOrderInvoiceResponse> list = orderDetailBizService.filterListInv(filterOrderDetailBizRequest);
-        if(list.size()==0){
+        if (list.size() == 0) {
             ioOrderDetailBizEntity.setRegStatus(false);
         }
         orderDetailCodeService.updateOrderDetailBiz(ioOrderDetailBizEntity);
@@ -642,7 +642,9 @@ public class IoOrderDetailBizController extends BaseController {
     public BaseResponse filterBizOrderList(FilterOrderDetailCodeRequest orderDetailBizRequest) {
         List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(orderDetailBizRequest);
         for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
+            if (ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) {
                 ioOrderDetailCodeRespons.setAmount(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
+            }
             String msg = "";
             IoOrderInvoiceRequest ioOrderInvoiceEntity = new IoOrderInvoiceRequest();
             ioOrderInvoiceEntity.setOrderIdFk(ioOrderDetailCodeRespons.getOrderIdFk());

src/main/java/com/glxp/api/controller/purchase/PurOrderController.java

@@ -1,5 +1,6 @@
 package com.glxp.api.controller.purchase;
 
+import cn.hutool.core.util.IdUtil;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.annotation.RepeatSubmit;
@@ -334,6 +335,7 @@ public class PurOrderController {
     public BaseResponse add() {
         Long userId = customerService.getUserId();
         PurOrderEntity purOrderEntity = new PurOrderEntity();
+        purOrderEntity.setId(IdUtil.getSnowflakeNextId());
         purOrderEntity.setCreateUser(userId + "");
         purOrderEntity.setCreateTime(new Date());
         purOrderEntity.setUpdateTime(new Date());

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

@@ -68,4 +68,6 @@ public interface IoOrderDao extends BaseMapperPlus<IoOrderDao, IoOrderEntity, Io
      * @return
      */
     List<String> selectWaitSubmitOrder(@Param("thirdSys") String thirdSys);
+
+    boolean updateOrder(IoOrderEntity orderEntity);
 }

src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java

@@ -8,8 +8,8 @@ import java.math.BigDecimal;
 @Data
 @TableName(value = "io_order_detail_biz")
 public class IoOrderDetailBizEntity {
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
-    private Integer id;
+    private Long id;
 
     /**
      * 订单号外键
@@ -186,7 +186,6 @@ public class IoOrderDetailBizEntity {
     private String checkFileName;
 
 
-
     @TableField(exist = false)
     private boolean checkSuccess;
 

src/main/java/com/glxp/api/entity/inout/IoOrderDetailCodeEntity.java

@@ -11,8 +11,8 @@ import java.math.BigDecimal;
 @Data
 @TableName(value = "io_order_detail_code")
 public class IoOrderDetailCodeEntity {
-    @TableId(value = "id", type = IdType.AUTO)
+    @TableId(value = "id", type = IdType.INPUT)
-    private Integer id;
+    private Long id;
 
     /**
      * 订单号外键
@@ -195,5 +195,4 @@ public class IoOrderDetailCodeEntity {
     private boolean regStatus;
 
 
-
 }

src/main/java/com/glxp/api/entity/inout/IoOrderInvoiceEntity.java

@@ -104,7 +104,7 @@ public class IoOrderInvoiceEntity {
     private String remark;
 
     @TableField(value = "bizIdFk")
-    private Integer bizIdFk;
+    private Long bizIdFk;
 
     @TableField(exist = false)
     private Integer  regId;

src/main/java/com/glxp/api/idc/service/impl/IdcServiceImpl.java

@@ -1162,17 +1162,74 @@ public class IdcServiceImpl implements IdcService {
         return success;
     }
 
+//    @Override
+//    public boolean signleDownloadFile(String syncIp, String fileName) {
+//        String filePathSlash = fileName.substring(filePath.length() - 1).equals("/") ? "" : "/";
+//        if(!FileUtils.makeDirectory(filePath + filePathSlash + imagePath))
+//            IDCUtils.createDirectory(filePath + filePathSlash + imagePath);
+//        OkHttpClient client = new OkHttpClient().newBuilder()
+//                .build();
+//        ;
+//        MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded");
+//
+//        RequestBody body = RequestBody.create(mediaType, "fileName=" + fileName);
+//
+//        Request request = new Request.Builder()
+//                .url(syncIp + "/spssync/common/downloadFile")
+//                .post(body)
+//                .addHeader("Content-Type", "application/x-www-form-urlencoded")
+//                .build();
+//        int total = 0;
+//        try {
+//            Response result = client.newCall(request).execute();
+//            String msg = result!=null ? result.message().length()>200 ? result.message().substring(0,200) : result.message() : "";
+//
+//            if (result!=null&&result.isSuccessful()&&MediaType.parse("application/force-download").equals(result.body().contentType())) {
+//                try (InputStream inputStream = result.body().byteStream()) {
+//
+//
+//                        FileOutputStream outputStream = new FileOutputStream(filePath + filePathSlash + imagePath+fileName);
+//
+//                        byte b[] = new byte[1024];
+//
+//                        int len = 0;
+//                        while ((len = inputStream.read(b)) != -1) {
+//                            total += len;
+//                            outputStream.write(b, 0, len);
+//
+//                        }
+//
+//                        outputStream.flush();
+//                        outputStream.close();
+//                        if(!(total>0)) {
+//                            new File(filePath + filePathSlash + imagePath+fileName).delete();
+//                            executeSql("delete from idc_file where filePath='"+fileName+"'");
+//                        }
+//
+//                } catch (Exception e) {
+//
+//
+//                }
+//            }
+//            if(!(total>0)) {
+//                String sql = "replace idc_file (filePath,createTime,msg) values ('"+fileName+"',now(),'"+msg+"')";
+//                executeSql(sql);
+//            }
+//
+//        } catch (IOException e) {
+//            // TODO Auto-generated catch block
+//            e.printStackTrace();
+//        }
+//       return (total>0);
+//    }
     @Override
-    public boolean signleDownloadFile(String syncIp, String fileName) {
+    public boolean signleDownloadFile(String syncIp, String fileFullName) {
-        String filePathSlash = filePath.substring(filePath.length() - 1).equals("/") ? "" : "/";
-        if(!FileUtils.makeDirectory(filePath + filePathSlash + imagePath))
-            IDCUtils.createDirectory(filePath + filePathSlash + imagePath);
         OkHttpClient client = new OkHttpClient().newBuilder()
                 .build();
         ;
         MediaType mediaType = MediaType.parse("application/x-www-form-urlencoded");
 
-        RequestBody body = RequestBody.create(mediaType, "fileName=" + fileName);
+        RequestBody body = RequestBody.create(mediaType, "fileName=" + fileFullName);
 
         Request request = new Request.Builder()
                 .url(syncIp + "/spssync/common/downloadFile")
@@ -1187,9 +1244,12 @@ public class IdcServiceImpl implements IdcService {
             if (result!=null&&result.isSuccessful()&&MediaType.parse("application/force-download").equals(result.body().contentType())) {
                 try (InputStream inputStream = result.body().byteStream()) {
 
+                    String path = fileFullName.substring(0,fileFullName.lastIndexOf("/"));
+                    if(!FileUtils.makeDirectory(path))
+                        IDCUtils.createDirectory(path);
 
 
-                        FileOutputStream outputStream = new FileOutputStream(filePath + filePathSlash + imagePath+fileName);
+                        FileOutputStream outputStream = new FileOutputStream(fileFullName);
 
                         byte b[] = new byte[1024];
 
@@ -1203,8 +1263,8 @@ public class IdcServiceImpl implements IdcService {
                         outputStream.flush();
                         outputStream.close();
                         if(!(total>0)) {
-                            new File(filePath + filePathSlash + imagePath+fileName).delete();
+                            new File(fileFullName).delete();
-                            executeSql("delete from idc_file where filePath='"+fileName+"'");
+                            executeSql("delete from idc_file where filePath='"+fileFullName+"'");
                         }
 
                 } catch (Exception e) {
@@ -1213,7 +1273,7 @@ public class IdcServiceImpl implements IdcService {
                 }
             }
             if(!(total>0)) {
-                String sql = "replace idc_file (filePath,createTime,msg) values ('"+fileName+"',now(),'"+msg+"')";
+                String sql = "replace idc_file (filePath,createTime,msg) values ('"+fileFullName+"',now(),'"+msg+"')";
                 executeSql(sql);
             }
 

src/main/java/com/glxp/api/req/basic/BasicCorpsExportRequest.java

@@ -6,7 +6,7 @@ import java.util.List;
 
 @Data
 public class BasicCorpsExportRequest {
-    List<Integer> ids;
+    List<Long> ids;
     private Integer id;
     private String key;
     private String unitId;

src/main/java/com/glxp/api/req/basic/BasicUnitMaintainFilterRequest.java

@@ -9,7 +9,7 @@ import java.util.List;
 @Data
 public class BasicUnitMaintainFilterRequest extends ListPageRequest {
 
-    private Integer id;
+    private Long id;
     private String key;
     private String unitId;
     private String name;

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

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class BizBindUpdateRequest {
 
-    private Integer id;
+    private Long id;
     private Long bindRlFk;
     private String supId;
 

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

@@ -60,7 +60,7 @@ public class IoOrderInvoiceRequest {
 
     private String remark;
 
-    private Integer bizIdFk;
+    private Long bizIdFk;
 
     public static final String COL_ID = "id";
 

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

@@ -10,7 +10,7 @@ import java.math.BigDecimal;
 @Data
 public class IoOrderDetailBizResponse {
 
-    private Integer id;
+    private Long id;
 
     /**
      * 订单号外键

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

@@ -10,7 +10,7 @@ import java.math.BigDecimal;
 @Data
 public class IoOrderDetailCodeResponse {
 
-    private Integer id;
+    private Long id;
 
     /**
      * 订单号外键

src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java

@@ -10,7 +10,7 @@ public class PurOrderResponse {
     /**
      *
      */
-    private Integer id;
+    private Long id;
     /**
      * 单据号
      */

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

@@ -12,7 +12,7 @@ import java.util.List;
 public interface IoOrderDetailBizService {
 
 
-    IoOrderDetailBizEntity selectById(Integer id);
+    IoOrderDetailBizEntity selectById(Long id);
 
     List<IoOrderDetailBizEntity> findByOrderId(String orderId);
 
@@ -22,13 +22,13 @@ public interface IoOrderDetailBizService {
 
     int update(IoOrderDetailBizEntity orderDetailBizEntity);
 
-    int deleteById(Integer id);
+    int deleteById(Long id);
 
     int deleteByOrderId(String billNo);
 
     boolean isExit(String billNo);
 
-    boolean isExit(Long relId, String bacthNo, Integer ignoreId, String orderId);
+    boolean isExit(Long relId, String bacthNo, Long ignoreId, String orderId);
 
     IoOrderDetailBizEntity findByUnique(String orderId, Long relId, String bacthNo, String productDate, String expireDate);
 
@@ -44,6 +44,7 @@ public interface IoOrderDetailBizService {
     List<IoOrderDetailBizEntity> checkOrderList(String orderId);
 
     List<IoOrderInvoiceResponse> filterListInv(FilterOrderDetailBizRequest orderDetailBizRequest);
+
     IoOrderInvoiceResponse selectByinvoiceId(Long id);
 
     Boolean updateOrderDetailBiz(IoOrderDetailBizEntity ioOrderDetailBizEntity);

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

@@ -19,7 +19,7 @@ public interface IoOrderDetailCodeService {
 
     int update(IoOrderDetailCodeEntity orderDetailCodeEntity);
 
-    int deleteById(Integer id);
+    int deleteById(Long id);
 
     /**
      * 查询单据扫码详情VO列表

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

@@ -1,6 +1,7 @@
 package com.glxp.api.service.inout.impl;
 
 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.PageHelper;
@@ -35,7 +36,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
     IoOrderDetailBizDao ioOrderDetailBizDao;
 
     @Override
-    public IoOrderDetailBizEntity selectById(Integer id) {
+    public IoOrderDetailBizEntity selectById(Long id) {
         return ioOrderDetailBizDao.selectById(id);
     }
 
@@ -57,7 +58,8 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
 
     @Override
     public int insert(IoOrderDetailBizEntity orderDetailBizEntity) {
-        orderDetailBizEntity.setId(null);
+        if (orderDetailBizEntity.getId() == null)
+            orderDetailBizEntity.setId(IdUtil.getSnowflakeNextId());
         return ioOrderDetailBizDao.insert(orderDetailBizEntity);
     }
 
@@ -67,7 +69,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
     }
 
     @Override
-    public int deleteById(Integer id) {
+    public int deleteById(Long id) {
         return ioOrderDetailBizDao.deleteById(id);
     }
 
@@ -85,7 +87,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
 
 
     @Override
-    public boolean isExit(Long relId, String bacthNo, Integer ignoreId, String orderId) {
+    public boolean isExit(Long relId, String bacthNo, Long ignoreId, String orderId) {
         return ioOrderDetailBizDao.exists(new QueryWrapper<IoOrderDetailBizEntity>().eq("bindRlFk", relId).eq(StrUtil.isNotEmpty(bacthNo), "batchNo", bacthNo)
                 .isNull(StrUtil.isEmpty(bacthNo), "batchNo").eq("orderIdFk", orderId).ne("id", ignoreId));
     }

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

@@ -2,6 +2,7 @@ package com.glxp.api.service.inout.impl;
 
 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.PageHelper;
@@ -58,7 +59,9 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
 
     @Override
     public int insert(IoOrderDetailCodeEntity orderDetailCodeEntity) {
-        orderDetailCodeEntity.setId(null);
+        if (orderDetailCodeEntity.getId() == null) {
+            orderDetailCodeEntity.setId(IdUtil.getSnowflakeNextId());
+        }
         return ioOrderDetailCodeDao.insert(orderDetailCodeEntity);
     }
 
@@ -68,7 +71,7 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
     }
 
     @Override
-    public int deleteById(Integer id) {
+    public int deleteById(Long id) {
         return ioOrderDetailCodeDao.deleteById(id);
     }
 
@@ -121,7 +124,7 @@ public class IoOrderDetailCodeServiceImpl implements IoOrderDetailCodeService {
 
     @Override
     public Boolean updateOrderDetailBiz(IoOrderDetailCodeEntity orderDetailCodeEntity) {
-        return ioOrderDetailCodeDao.updateById(orderDetailCodeEntity)>0;
+        return ioOrderDetailCodeDao.updateById(orderDetailCodeEntity) > 0;
     }
 
 }

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

@@ -1,5 +1,6 @@
 package com.glxp.api.service.inout.impl;
 
+import cn.hutool.core.util.IdUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
@@ -41,6 +42,8 @@ public class IoOrderInvoiceServiceImpl extends ServiceImpl<IoOrderInvoiceMapper,
 
     @Override
     public boolean insertInvoice(IoOrderInvoiceEntity ioOrderInvoiceEntity) {
+        if (ioOrderInvoiceEntity.getId() == null)
+            ioOrderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());
         return ioOrderInvoiceMapper.insert(ioOrderInvoiceEntity) > 0;
     }
 

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

@@ -14,9 +14,7 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.*;
 import com.glxp.api.dao.basic.*;
-import com.glxp.api.dao.inout.IoCodeLostMapper;
+import com.glxp.api.dao.inout.*;
-import com.glxp.api.dao.inout.IoCodeRelMapper;
-import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
 import com.glxp.api.dao.purchase.*;
 import com.glxp.api.dao.thrsys.ThrBusTypeOriginDao;
 import com.glxp.api.dto.RelaySyncDto;
@@ -55,6 +53,7 @@ import org.apache.ibatis.session.TransactionIsolationLevel;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -273,7 +272,7 @@ public class HeartService {
                 }
                 break;
             case IO_ORDER:
-                if(needExec())
+                if (needExec())
                     break;
         }
     }
@@ -1328,13 +1327,14 @@ public class HeartService {
                     if (response.getCode() == 20000 && response.getData() != null) {
 
 
-                        JSONArray fileJson = JSONUtil.parseObj(response.getData()).getJSONArray("files");
+                        JSONArray fileJson = JSONUtil.parseObj(response.getData()).getJSONArray("syncFiles");
                         SpsSyncOrderResponse syncDataResponse = JSONObject.parseObject(response.getData(), new TypeReference<SpsSyncOrderResponse>() {
                         });
                         BasicDownloadStatusEntity basicDownloadStatusEntity = new BasicDownloadStatusEntity();
                         basicDownloadStatusEntity.setId(CustomUtil.getId());
                         basicDownloadStatusEntity.setTaskId(syncDataResponse.getTaskId());
                         basicDownloadStatusEntity.setStartTime(startTime);
+                        basicDownloadStatusEntity.setUpdateTime(startTime);
                         basicDownloadStatusEntity.setIdDatas(ConstantStatus.SYNC_DOWNLOAD_SCAN_ORDER);
                         basicDownloadStatusEntity.setStatus(ConstantStatus.SYNC_STATUS_WAIT); //下载中
                         basicDownloadStatusEntity.setType(NEW_ALL_ORDER);
@@ -1346,14 +1346,13 @@ public class HeartService {
                             try {
                                 List<IoOrderEntity> orderEntities = syncDataResponse.getOrderEntities();
                                 for (IoOrderEntity orderEntity : orderEntities) {
-
                                     SyncDataBustypeEntity syncDataBustypeEntity = syncDataBustypeService.findByAction(orderEntity.getAction(), 2);
                                     orderEntity.setUpdateTime(null);
                                     orderEntity.setFromType(ConstantStatus.FROM_UDISP);
                                     orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_POST);
                                     orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
                                     if (syncDataBustypeEntity != null) {
-                                        if (syncDataBustypeEntity.getSyncStatus() == 1) {
+                                        if (syncDataBustypeEntity.getSyncStatus() != null && syncDataBustypeEntity.getSyncStatus().compareTo(1) == 0) {
                                             orderEntity.setProcessStatus(ConstantStatus.ORDER_DEAL_DRAFT);
                                             orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
                                         }
@@ -1374,7 +1373,8 @@ public class HeartService {
                                                 ioCheckInoutService.check(orderEntity.getBillNo());
                                             }
                                         }
-
+                                    } else {
+                                        updateOrderDb(syncDataResponse, orderEntity);
                                     }
                                 }
                                 if (fileJson != null && fileJson.size() > 0) {
@@ -1829,7 +1829,6 @@ public class HeartService {
             List<IoOrderDetailBizEntity> orderDetailBizEntities = syncDataResponse.getOrderDetailBizEntities();
             for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
                 if (bizEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
-                    bizEntity.setId(null);
                     orderDetailBizService.insert(bizEntity);
                 }
             }
@@ -1840,7 +1839,6 @@ public class HeartService {
             List<IoOrderDetailCodeEntity> orderDetailCodeEntities = syncDataResponse.getOrderDetailCodeEntities();
             for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {
                 if (codeEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
-                    codeEntity.setId(null);
                     orderDetailCodeService.insert(codeEntity);
                 }
             }
@@ -1863,7 +1861,49 @@ public class HeartService {
             List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
             for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
                 if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
-                    orderInvoiceEntity.setId(IdUtil.getSnowflakeNextId());
+                    orderInvoiceService.insertInvoice(orderInvoiceEntity);
+                }
+            }
+        }
+    }
+
+    @Resource
+    IoOrderDetailBizDao ioOrderDetailBizDao;
+
+    @Resource
+    IoOrderDetailCodeDao ioOrderDetailCodeDao;
+    @Resource
+    IoOrderDao orderDao;
+
+
+    @Resource
+    public void updateOrderDb(SpsSyncOrderResponse syncDataResponse, IoOrderEntity orderEntity) {
+        orderDao.updateOrder(orderEntity);
+        //更新业务详情
+        if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailBizEntities())) {
+            List<IoOrderDetailBizEntity> orderDetailBizEntities = syncDataResponse.getOrderDetailBizEntities();
+            for (IoOrderDetailBizEntity bizEntity : orderDetailBizEntities) {
+                if (bizEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
+                    ioOrderDetailBizDao.insertOrUpdate(bizEntity);
+                }
+            }
+        }
+
+        //更新码详情
+        if (CollUtil.isNotEmpty(syncDataResponse.getOrderDetailCodeEntities())) {
+            List<IoOrderDetailCodeEntity> orderDetailCodeEntities = syncDataResponse.getOrderDetailCodeEntities();
+            for (IoOrderDetailCodeEntity codeEntity : orderDetailCodeEntities) {
+                if (codeEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
+                    ioOrderDetailCodeDao.insertOrUpdate(codeEntity);
+                }
+            }
+        }
+
+        //更新发票信息
+        if (CollUtil.isNotEmpty(syncDataResponse.getOrderInvoiceEntities())) {
+            List<IoOrderInvoiceEntity> orderInvoiceEntities = syncDataResponse.getOrderInvoiceEntities();
+            for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {
+                if (orderInvoiceEntity.getOrderIdFk().equals(orderEntity.getBillNo())) {
                     orderInvoiceService.insertInvoice(orderInvoiceEntity);
                 }
             }

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

@@ -376,7 +376,8 @@
                auth_warehouse.name,
                auth_warehouse.parentId,
                auth_warehouse.parentCode,
-               auth_dept.name warehouseName
+               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

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

@@ -150,10 +150,14 @@
         (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,
-        (SELECT count(*) FROM io_order_detail_code  WHERE io_order_detail_code.orderIdFk = io.billNo
+        (SELECT count(*)
+        FROM io_order_detail_code
+        WHERE io_order_detail_code.orderIdFk = io.billNo
         and io_order_detail_code.regStatus = 1
         ) AS allCout,
-        (SELECT count(*) FROM io_order_detail_code  WHERE io_order_detail_code.orderIdFk = io.billNo
+        (SELECT count(*)
+        FROM io_order_detail_code
+        WHERE io_order_detail_code.orderIdFk = io.billNo
         and io_order_detail_code.regStatus = 0
         ) As partCount
         from io_order as io
@@ -196,10 +200,12 @@
                 AND relKey = #{relKey}
             </if>
             <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
-                AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
+                AND date_format(createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
+                date_format(#{endTime}, '%Y-%m-%d')
             </if>
             <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
-                AND date_format(auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
+                AND date_format(auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and
+                date_format(#{endAduditTime}, '%Y-%m-%d')
             </if>
             <if test="actions != null and actions.size() != 0">
                 AND `action` in
@@ -418,4 +424,15 @@
             </if>
         </where>
     </select>
+
+
+    <update id="updateOrder" parameterType="com.glxp.api.entity.inout.IoOrderEntity">
+        UPDATE io_order
+        <trim prefix="set" suffixOverrides=",">
+            <if test="checkStatus != null">
+                checkStatus=#{checkStatus},
+            </if>
+        </trim>
+        WHERE billNo = #{billNo}
+    </update>
 </mapper>

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

@@ -65,15 +65,19 @@
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND ic.orderIdFk = #{orderIdFk}
             </if>
+            <if test="orderIdFk == null || orderIdFk == ''">
+                AND (ic.orderIdFk is null or ic.orderIdFk = '')
+            </if>
             <if test="relId != null">
                 AND ic.bindRlFk = #{relId}
             </if>
             <if test="batchNo != null and batchNo != ''">
                 AND ic.batchNo = #{batchNo}
             </if>
-            <if test="bizIdFk != null and bizIdFk != ''">
+            <if test="batchNo == null || batchNo == ''">
-                AND ic.bizIdFk = #{bizIdFk}
+                AND (ic.batchNo is null or ic.batchNo = '')
             </if>
+
         </where>
         GROUP BY ic.id
     </select>

src/main/resources/schemas/schema_v2.1.sql

@@ -412,3 +412,7 @@ CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'serialNo', 'varchar(255)', 1
 CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncStatus', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('sync_data_bustypes', 'syncChange', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'spaceOut', 'tinyint', 1);
+
+
+CALL Pro_Temp_ColumnWork('io_order_detail_code', 'id', 'bigint ', 2);
+CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'id', 'bigint ', 2);