diff --git a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java index 5527b43a..74ae9d7f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java +++ b/api-admin/src/main/java/com/glxp/api/admin/constant/ConstantStatus.java @@ -25,4 +25,16 @@ public class ConstantStatus { public static final Integer ORDER_SIGN_UN = 0; //未签字 public static final Integer ORDER_SIGN_ED = 1; //已签字 public static final Integer ORDER_SIGN_FAIL = 2; //签字失败 + + + //UDI产品信息表字段类型 + public static final Integer PRODUCT_TYPE_UDI = 0; + public static final Integer PRODUCT_TYPE_THIRD = 1; + + //DI类型 + public static final Integer DI_TYPE_MAIN = 1;//主标识 + public static final Integer DI_TYPE_SYDY = 2;//使用单元 + public static final Integer DI_TYPE_BTBS = 3;//本体标识 + public static final Integer DI_TYPE_BZBS = 4;//包装标识 + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java index cf9da5c3..e60682af 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/LoginController.java @@ -2,6 +2,7 @@ package com.glxp.api.admin.controller.auth; import com.glxp.api.admin.req.auth.LoginRequest; import com.glxp.api.admin.req.auth.UpdatePasswordRequest; +import com.glxp.api.admin.util.DateUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -78,6 +79,7 @@ public class LoginController { Map map = new HashMap<>(); map.put("id", authAdmin.getId()); map.put("token", token); + map.put("time", DateUtil.getDateTime()); return ResultVOUtils.success(map); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpImportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpImportLogController.java index 663f9f4d..b8bcf1f9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpImportLogController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/CorpImportLogController.java @@ -148,7 +148,7 @@ public class CorpImportLogController { corpImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); corpImportLogService.insertImportLog(corpImportLogEntity); List corpImportDetailEntities = new ArrayList<>(); - for (int j = 0; j < workbook.getNumberOfSheets(); j++) { + for (int j = 0; j < 1; j++) { sheet = workbook.getSheetAt(j); if (sheet == null) { continue; @@ -164,13 +164,16 @@ public class CorpImportLogController { || !"联系人".equals(row.getCell(4).getStringCellValue()) || !"联系电话".equals(row.getCell(5).getStringCellValue()) || !"社会信用号".equals(row.getCell(6).getStringCellValue()) - || !"往来单位状态".equals(row.getCell(6).getStringCellValue()) - || !"往来单位类型".equals(row.getCell(6).getStringCellValue()) - || !"thirdId".equals(row.getCell(6).getStringCellValue()))) { + || !"往来单位状态".equals(row.getCell(7).getStringCellValue()) + || !"往来单位类型".equals(row.getCell(8).getStringCellValue()) + || !"thirdId".equals(row.getCell(9).getStringCellValue()))) { return ResultVOUtils.error(500, "文件格式错误!"); } for (int k = sheet.getFirstRowNum()+1; k <= sheet.getLastRowNum(); k++) { row = sheet.getRow(k); + if (row.getRowNum() <= 0) { + continue; + } CorpImportDetailEntity corpImportDetailEntity = new CorpImportDetailEntity(); Cell cell1 = row.getCell(0); if (cell1 != null) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java index 698933e0..21dd68f4 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoController.java @@ -160,10 +160,7 @@ public class UdiInfoController { if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); - - if (basicThirdSysDetailEntity.getEnabled()) { - if (basicThirdSysDetailEntity.getFromType() == 0 || (filterErpGoodsRequest.getIsDownThrSys() != null && filterErpGoodsRequest.getIsDownThrSys())) { ErpBasicClient erpBasicHttpClient = new ErpBasicClient(); BaseResponse> udiDlDeviceResponse = erpBasicHttpClient.getErpProducts(filterErpGoodsRequest, basicThirdSysDetailEntity.getValue()); @@ -186,8 +183,7 @@ public class UdiInfoController { } else { FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); BeanUtils.copyProperties(filterErpGoodsRequest, filterThrProductsRequest); - - filterThrProductsRequest.setUnionCode(filterErpGoodsRequest.getCode()); + filterThrProductsRequest.setThirdSysFk(filterErpGoodsRequest.getThirdSys()); filterThrProductsRequest.setCode(null); List thrCorpEntities diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java index 32302127..0afcfbcd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoExportLogController.java @@ -9,6 +9,8 @@ import com.glxp.api.admin.req.basic.UdiInfoExportRequest; import com.glxp.api.admin.req.inout.DeleteRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.res.basic.UdiRlDlResponse; +import com.glxp.api.admin.res.inout.WarehouseResponse; import com.glxp.api.admin.service.basic.UdiInfoExportLogService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.thread.BasicGenExcelService; @@ -16,6 +18,7 @@ import com.glxp.api.admin.util.CustomUtil; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.beans.BeanUtils; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -29,6 +32,7 @@ import java.io.FileInputStream; import java.io.OutputStream; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; /** * 医疗器械信息导出 @@ -170,12 +174,17 @@ public class UdiInfoExportLogController { List udiRelevanceResponses = null; udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); - + List udiRlDlResponses = udiRelevanceResponses.stream().map(item -> + { + UdiRlDlResponse udiRlDlResponse = new UdiRlDlResponse(); + BeanUtils.copyProperties(item, udiRlDlResponse); + return udiRlDlResponse; + }).collect(Collectors.toList()); PageInfo pageInfo; pageInfo = new PageInfo<>(udiRelevanceResponses); - PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); pageSimpleResponse.setTotal(pageInfo.getTotal()); - pageSimpleResponse.setList(udiRelevanceResponses); + pageSimpleResponse.setList(udiRlDlResponses); return ResultVOUtils.success(pageSimpleResponse); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java index d5948ba9..8480712f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiInfoImportLogController.java @@ -147,7 +147,7 @@ public class UdiInfoImportLogController { udiInfoImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); udiInfoImportLogService.insertImportLog(udiInfoImportLogEntity); List udiInfoImportEntities = new ArrayList<>(); - for (int j = 0; j < workbook.getNumberOfSheets(); j++) { + for (int j = 0; j < 1; j++) { sheet = workbook.getSheetAt(j); if (sheet == null) { continue; @@ -167,6 +167,20 @@ public class UdiInfoImportLogController { } for (int k = sheet.getFirstRowNum()+1; k <= sheet.getLastRowNum(); k++) { row = sheet.getRow(k); + if (row.getRowNum() <= 0) { + continue; + } + if ((row.getCell(0) == null && row.getCell(1) == null && row.getCell(2) == null + && row.getCell(3) == null && row.getCell(4) == null && row.getCell(5) == null&& row.getCell(6) == null) || + ("".equals(row.getCell(0).getStringCellValue()) + && "".equals(row.getCell(1).getStringCellValue()) + && "".equals(row.getCell(2).getStringCellValue()) + && "".equals(row.getCell(3).getStringCellValue()) + && "".equals(row.getCell(4).getStringCellValue()) + && "".equals(row.getCell(5).getStringCellValue()) + && "".equals(row.getCell(6).getStringCellValue()))) { + continue; + } UdiInfoImportDetailEntity udiInfoImportEntity = new UdiInfoImportDetailEntity(); Cell cell1 = row.getCell(0); if (cell1 != null) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java index 08f40409..80eed45d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java @@ -290,12 +290,22 @@ public class UdiRelevanceController { if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) return ResultVOUtils.error(500, "ERP产品信息接口地址未定义"); String url = basicThirdSysDetailEntity.getValue(); - String errMsg = basicUpdateProductService.addProduct(combineRequest, url); - if (errMsg == null) - return ResultVOUtils.success("添加成功!"); - else { - return ResultVOUtils.error(500, errMsg); + if (basicThirdSysDetailEntity.getFromType() == 0) { + String errMsg = basicUpdateProductService.addProduct(combineRequest, url); + if (errMsg == null) + return ResultVOUtils.success("添加成功!"); + else { + return ResultVOUtils.error(500, errMsg); + } + } else { + String errMsg = basicUpdateProductService.addLocalProduct(combineRequest); + if (errMsg == null) + return ResultVOUtils.success("添加成功!"); + else { + return ResultVOUtils.error(500, errMsg); + } } + } @@ -434,7 +444,7 @@ public class UdiRelevanceController { filterSysEntityList.add(new FilterSysEntity(2, "未对照DI")); if (basicThirdSysEntities != null && basicThirdSysEntities.size() > 0) { for (int i = 0; i < basicThirdSysEntities.size(); i++) { - filterSysEntityList.add(new FilterSysEntity(i + 3, "未对照"+basicThirdSysEntities.get(i).getThirdName())); + filterSysEntityList.add(new FilterSysEntity(i + 3, "未对照" + basicThirdSysEntities.get(i).getThirdName())); } } PageInfo pageInfo; diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderImportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderImportLogController.java index 7bedd9d2..367143a0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderImportLogController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderImportLogController.java @@ -148,7 +148,7 @@ public class ThrOrderImportLogController { thrOrderImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); thrOrderImportLogService.insertImportLog(thrOrderImportLogEntity); List corpImportDetailEntities = new ArrayList<>(); - for (int j = 0; j < workbook.getNumberOfSheets(); j++) { + for (int j = 0; j < 1; j++) {//workbook.getNumberOfSheets() sheet = workbook.getSheetAt(j); if (sheet == null) { continue; @@ -156,7 +156,7 @@ public class ThrOrderImportLogController { // 滤过第一行标题 row = sheet.getRow(0); if ((row.getCell(0) == null || row.getCell(1) == null || row.getCell(2) == null - || row.getCell(3) == null || row.getCell(4) == null || row.getCell(5) == null|| row.getCell(6) == null) || + || row.getCell(3) == null || row.getCell(4) == null || row.getCell(5) == null || row.getCell(6) == null) || (!"单据号".equals(row.getCell(0).getStringCellValue()) || !"单据日期".equals(row.getCell(1).getStringCellValue()) || !"往来单位ID".equals(row.getCell(2).getStringCellValue()) @@ -166,8 +166,11 @@ public class ThrOrderImportLogController { || !"产品ID".equals(row.getCell(6).getStringCellValue()))) { return ResultVOUtils.error(500, "文件格式错误!"); } - for (int k = sheet.getFirstRowNum()+1; k <= sheet.getLastRowNum(); k++) { + for (int k = sheet.getFirstRowNum() + 1; k <= sheet.getLastRowNum(); k++) { row = sheet.getRow(k); + if (row.getRowNum() <= 0) { + continue; + } ThrOrderImportDetailEntity corpImportDetailEntity = new ThrOrderImportDetailEntity(); Cell cell1 = row.getCell(0); if (cell1 != null) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsImportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsImportLogController.java index 1999f2f9..2b1722e8 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsImportLogController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsImportLogController.java @@ -30,8 +30,7 @@ public class ThrProductsImportLogController { @Resource ThrProductsImportDetailService thrProductsImportDetailService; - @GetMapping("/udiwms/thrProducts//importLog/filter") - + @GetMapping("/udiwms/thrProducts/importLog/filter") public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java index 32ea1309..c6b93ada 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoEntity.java @@ -34,6 +34,7 @@ public class UdiInfoEntity { private String sptm; private String manufactory; private String measname; + private Integer productType; //本地生成信息 @@ -98,6 +99,7 @@ public class UdiInfoEntity { } return bhzxxsbzsl; } + public String getSptm() { return sptm; } @@ -347,7 +349,7 @@ public class UdiInfoEntity { } public Integer getCount() { - if(count ==null) + if (count == null) return 1; return count; } @@ -379,4 +381,12 @@ public class UdiInfoEntity { public void setCheck(Boolean check) { isCheck = check; } + + public Integer getProductType() { + return productType; + } + + public void setProductType(Integer productType) { + this.productType = productType; + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java index b9226815..5d3c7e3d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpInvClient.java @@ -65,6 +65,9 @@ public class ErpInvClient { paramMap.put("registerCertNo", onhandRequest.getRegisterCertNo()); if (onhandRequest.getManufactory() != null && !onhandRequest.getManufactory().equals("")) paramMap.put("manufactory", onhandRequest.getManufactory()); + + if (onhandRequest.getFilterCount() != null && !onhandRequest.getFilterCount().equals("")) + paramMap.put("filterCount", onhandRequest.getFilterCount()); if (onhandRequest.getPage() != null) paramMap.put("page", onhandRequest.getPage()); if (onhandRequest.getLimit() != null) diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java index d47f06ab..322e0ac6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inventory/ErpOnhandRequest.java @@ -28,4 +28,5 @@ public class ErpOnhandRequest extends ListPageRequest { private String spec; private String registerCertNo; private String manufactory; + private Integer filterCount;//0:不过滤,1,过滤等于0,2.过滤大于0 } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java index dfb07f5f..6bed7933 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrInvProductsRequest.java @@ -26,4 +26,5 @@ public class FilterThrInvProductsRequest extends ListPageRequest { private String spec; private String registerCertNo; private String manufactory; + private Integer filterCount;//0:不过滤,1,过滤等于0,2.过滤大于0 } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java index 3c933f80..b9437701 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRelevanceResponse.java @@ -48,5 +48,5 @@ public class UdiRelevanceResponse { private Boolean isDisable; private String erpId; private String erpName; - + private Integer productType; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRlDlResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRlDlResponse.java new file mode 100644 index 00000000..2648590e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/basic/UdiRlDlResponse.java @@ -0,0 +1,53 @@ +package com.glxp.api.admin.res.basic; + +import lombok.Data; + +@Data +public class UdiRlDlResponse { + + private int id; + private String thirdId; + private String thirdName; + private String uuid; + private String nameCode; + private String packLevel; + private String packRatio; + private Integer bhxjsl; + private Integer bhzxxsbzsl; + private Integer zxxsbzbhsydysl; + private String bhxjcpbm; + private String sjcpbm; // + private String bzcj; + private String addType; + private String deviceRecordKey; + private int isUseDy; + private String cpmctymc; + private String cplb; + private String flbm; + private String ggxh; + private String qxlb; + private String tyshxydm; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; + private String ylqxzcrbarywmc; + private String sydycpbs; + private int versionNumber; + private int diType; + private String thirdId1; + private String thirdName1; + private String thirdId2; + private String thirdName2; + private String thirdId3; + private String thirdName3; + private String thirdId4; + private String thirdName4; + private String ybbm; + private String sptm; + private Integer productType; + + public Integer getProductType() { + if (productType == null) return 0 + ; + return productType; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicBackUpdateProductService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicBackUpdateProductService.java index f0017642..3e0adf4b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicBackUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicBackUpdateProductService.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.thread; +import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; @@ -84,7 +85,8 @@ public class BasicBackUpdateProductService { udiInfoEntity.setCpmctymc(invmandocResponse.getName()); udiInfoEntity.setGgxh(invmandocResponse.getSpec()); udiInfoEntity.setUuid(CustomUtil.getUUId()); - udiInfoEntity.setDiType(1); + udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); + udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN); udiInfoEntity.setManufactory(invmandocResponses.get(0).getManufactory()); udiInfoEntity.setYlqxzcrbarmc(invmandocResponses.get(0).getManufactory()); @@ -178,7 +180,7 @@ public class BasicBackUpdateProductService { if (thrProductsEntities != null && thrProductsEntities.size() > 0) { for (ThrProductsEntity thrProductsEntity : thrProductsEntities) { UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectByThirdId(thrProductsEntity.getCode(), thirdSysId); - if (udiRelevanceEntity == null){ + if (udiRelevanceEntity == null) { if (isUpdate.getParamValue().equals("1")) { UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); @@ -186,7 +188,8 @@ public class BasicBackUpdateProductService { udiInfoEntity.setCpmctymc(thrProductsEntity.getName()); udiInfoEntity.setGgxh(thrProductsEntity.getSpec()); udiInfoEntity.setUuid(CustomUtil.getUUId()); - udiInfoEntity.setDiType(1); + udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); + udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN); udiInfoEntity.setManufactory(thrProductsEntity.getManufactory()); udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory()); udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); @@ -251,7 +254,8 @@ public class BasicBackUpdateProductService { udiInfoEntity.setCpmctymc(onhandQueryResponse.getName()); udiInfoEntity.setGgxh(onhandQueryResponse.getSpec()); udiInfoEntity.setUuid(CustomUtil.getUUId()); - udiInfoEntity.setDiType(1); + udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); + udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN); udiInfoEntity.setManufactory(erpProductsMap.get(onhandQueryResponse.getCode()).getManufactory()); udiInfoEntity.setYlqxzcrbarmc(erpProductsMap.get(onhandQueryResponse.getCode()).getManufactory()); udiInfoEntity.setZczbhhzbapzbh(erpProductsMap.get(onhandQueryResponse.getCode()).getRegisterNo()); @@ -289,7 +293,8 @@ public class BasicBackUpdateProductService { udiInfoEntity.setCpmctymc(onhandQueryResponse.getName()); udiInfoEntity.setGgxh(onhandQueryResponse.getSpec()); udiInfoEntity.setUuid(CustomUtil.getUUId()); - udiInfoEntity.setDiType(1); + udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); + udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN); udiInfoEntity.setManufactory(erpProductsResponse.getManufactory()); udiInfoEntity.setYlqxzcrbarmc(erpProductsResponse.getManufactory()); udiInfoEntity.setZczbhhzbapzbh(erpProductsResponse.getRegisterNo()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUdiInfoImportService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUdiInfoImportService.java index 55159c37..51a6123e 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUdiInfoImportService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUdiInfoImportService.java @@ -3,6 +3,7 @@ package com.glxp.api.admin.thread; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.glxp.api.admin.constant.BasicProcessStatus; +import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.entity.basic.*; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; @@ -105,7 +106,8 @@ public class BasicUdiInfoImportService { udiInfoEntity.setCpmctymc(thrProductsEntity.getName()); udiInfoEntity.setGgxh(thrProductsEntity.getSpec()); udiInfoEntity.setUuid(CustomUtil.getUUId()); - udiInfoEntity.setDiType(1); + udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); + udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN); udiInfoEntity.setManufactory(thrProductsEntity.getManufactory()); udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory()); udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java index 5744e19a..ea5ed28d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java @@ -2,11 +2,13 @@ package com.glxp.api.admin.thread; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; +import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.UdiEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.entity.thrsys.ThrInvProductsEntity; import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; import com.glxp.api.admin.httpclient.ErpBasicClient; import com.glxp.api.admin.httpclient.ErpInvClient; @@ -14,6 +16,7 @@ import com.glxp.api.admin.req.basic.CombineRequest; import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; import com.glxp.api.admin.req.inventory.ErpOnhandRequest; +import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest; import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpProductsResponse; @@ -22,6 +25,7 @@ import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.service.thrsys.ThrInvProductsService; import com.glxp.api.admin.service.thrsys.ThrProductsService; import com.glxp.api.admin.util.CustomUtil; import com.glxp.api.admin.util.DateUtil; @@ -53,6 +57,8 @@ public class BasicUpdateProductService { @Resource ThrProductsService thrProductsService; @Resource + ThrInvProductsService thrInvProductsService; + @Resource SystemParamConfigService systemParamConfigService; @Resource BasicThirdSysDetailService basicThirdSysDetailService; @@ -83,6 +89,7 @@ public class BasicUpdateProductService { BasicThirdSysDetailEntity inQuery = basicThirdSysDetailService.selectByKey("invPiUrl", combineRequest.getThirdSys()); ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); erpOnhandRequest.setInventoryCodes(inventoryCodes); + erpOnhandRequest.setFilterCount(2); List erpOnHandResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, inQuery.getValue()); if (erpOnHandResponses != null && erpOnHandResponses.size() > 0) { ErpInvProductResponse erpInvProductResponse = erpOnHandResponses.get(0); @@ -93,47 +100,19 @@ public class BasicUpdateProductService { errMsg = "部分未找到库存信息无法添加!"; } } else { - FilterThrProductsRequest filterThrInvProductsRequest = new FilterThrProductsRequest(); - filterThrInvProductsRequest.setCode(inventoryCode); - List thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrInvProductsRequest); - if (thrProductsEntities != null && thrProductsEntities.size() > 0) { - for (ThrProductsEntity thrProductsEntity : thrProductsEntities) { - UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); - udiInfoEntity.setNameCode(thrProductsEntity.getCode()); - udiInfoEntity.setCpmctymc(thrProductsEntity.getName()); - udiInfoEntity.setGgxh(thrProductsEntity.getSpec()); - udiInfoEntity.setUuid(CustomUtil.getUUId()); - udiInfoEntity.setDiType(1); - udiInfoEntity.setManufactory(thrProductsEntity.getManufactory()); - udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory()); - udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); - udiInfoService.insertUdiInfo(udiInfoEntity); - UdiRelevanceEntity udiRelevanceEntity2 = new UdiRelevanceEntity(); - udiRelevanceEntity2.setUuid(udiInfoEntity.getUuid()); - - - if ("thirdId".equals(combineRequest.getThirdSys())) { - udiRelevanceEntity2.setThirdId(thrProductsEntity.getCode()); - udiRelevanceEntity2.setThirdName(thrProductsEntity.getName()); - } else if ("thirdId1".equals(combineRequest.getThirdSys())) { - udiRelevanceEntity2.setThirdId1(thrProductsEntity.getCode()); - udiRelevanceEntity2.setThirdName1(thrProductsEntity.getName()); - } else if ("thirdId2".equals(combineRequest.getThirdSys())) { - udiRelevanceEntity2.setThirdId4(thrProductsEntity.getCode()); - udiRelevanceEntity2.setThirdName4(thrProductsEntity.getName()); - } else if ("thirdId3".equals(combineRequest.getThirdSys())) { - udiRelevanceEntity2.setThirdId3(thrProductsEntity.getCode()); - udiRelevanceEntity2.setThirdName3(thrProductsEntity.getName()); - } else if ("thirdId4".equals(combineRequest.getThirdSys())) { - udiRelevanceEntity2.setThirdId4(thrProductsEntity.getCode()); - udiRelevanceEntity2.setThirdName4(thrProductsEntity.getName()); - } - - udiRelevanceEntity2.setThirdId(thrProductsEntity.getCode()); - udiRelevanceEntity2.setThirdName(thrProductsEntity.getName()); - udiRelevanceEntity2.setUpdateTime(DateUtil.getDateTime()); - udiRelevanceService.insertUdiRelevance(udiRelevanceEntity2); - } + FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest(); + filterThrInvProductsRequest.setInventoryCode(inventoryCode); + filterThrInvProductsRequest.setFilterCount(2); + List thrInvProductsEntities = thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest); + if (thrInvProductsEntities != null && thrInvProductsEntities.size() > 0) { + ThrInvProductsEntity thrInvProductsEntity = thrInvProductsEntities.get(0); + Map erpProductsMap = new HashMap<>(); + ErpInvProductResponse erpProductsResponse = new ErpInvProductResponse(); + BeanUtils.copyProperties(thrInvProductsEntity, erpProductsResponse); + erpProductsResponse.setCode(thrInvProductsEntity.getInventoryCode()); + erpProductsResponse.setName(thrInvProductsEntity.getInventoryName()); + erpProductsMap.put(thrInvProductsEntity.getInventoryCode(), erpProductsResponses.get(0)); + addRl(erpProductsResponse, combineRequest.getThirdSys(), erpProductsMap); } else { errMsg = "部分未找到库存信息无法添加!"; } @@ -149,7 +128,8 @@ public class BasicUpdateProductService { udiInfoEntity.setGgxh(erpProductsResponse.getSpec()); udiInfoEntity.setZczbhhzbapzbh(erpProductsResponse.getRegisterNo()); udiInfoEntity.setUuid(CustomUtil.getUUId()); - udiInfoEntity.setDiType(1); + udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); + udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN); udiInfoService.insertUdiInfo(udiInfoEntity); udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); udiRelevanceEntity1.setThirdName(erpProductsResponse.getName()); @@ -162,6 +142,83 @@ public class BasicUpdateProductService { return errMsg; } + public String addLocalProduct(CombineRequest combineRequest) { + String errMsg = null; + List inventoryCodes = new ArrayList<>(); + if (combineRequest.getThirdIds() == null) + inventoryCodes.add(combineRequest.getThirdId()); + else { + inventoryCodes = combineRequest.getThirdIds(); + } + if (inventoryCodes.size() > 0) { + for (String inventoryCode : inventoryCodes) { + UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity(); + udiRelevanceEntity1.setThirdId(inventoryCode); + FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); + filterThrProductsRequest.setCode(inventoryCode); + List thrProductsEntities = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); + if (thrProductsEntities != null && thrProductsEntities.size() > 0) { + ThrProductsEntity thrProductsEntity = thrProductsEntities.get(0); + ErpProductsResponse erpProductsResponse = new ErpProductsResponse(); + BeanUtils.copyProperties(thrProductsEntity, erpProductsResponse); + if (combineRequest.getIsRlInv() != null && combineRequest.getIsRlInv()) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("piQueryUrl", combineRequest.getThirdSys()); + if (basicThirdSysDetailEntity.getFromType() == 0) { + BasicThirdSysDetailEntity inQuery = basicThirdSysDetailService.selectByKey("invPiUrl", combineRequest.getThirdSys()); + ErpOnhandRequest erpOnhandRequest = new ErpOnhandRequest(); + erpOnhandRequest.setInventoryCodes(inventoryCodes); + erpOnhandRequest.setFilterCount(2); + List erpOnHandResponses = new ErpInvClient().getInvPrdoduct(erpOnhandRequest, inQuery.getValue()); + if (erpOnHandResponses != null && erpOnHandResponses.size() > 0) { + ErpInvProductResponse erpInvProductResponse = erpOnHandResponses.get(0); + Map erpProductsMap = new HashMap<>(); + erpProductsMap.put(erpInvProductResponse.getCode(), erpProductsResponse); + addRl(erpInvProductResponse, combineRequest.getThirdSys(), erpProductsMap); + } else { + errMsg = "部分未找到库存信息无法添加!"; + } + } else { + FilterThrInvProductsRequest filterThrInvProductsRequest = new FilterThrInvProductsRequest(); + filterThrInvProductsRequest.setInventoryCode(inventoryCode); + filterThrInvProductsRequest.setFilterCount(2); + List thrInvProductsEntities = thrInvProductsService.filterThrInvProductss(filterThrInvProductsRequest); + if (thrInvProductsEntities != null && thrInvProductsEntities.size() > 0) { + ThrInvProductsEntity thrInvProductsEntity = thrInvProductsEntities.get(0); + Map erpProductsMap = new HashMap<>(); + ErpInvProductResponse erpInvProductResponse = new ErpInvProductResponse(); + BeanUtils.copyProperties(thrInvProductsEntity, erpInvProductResponse); + erpInvProductResponse.setCode(thrInvProductsEntity.getInventoryCode()); + erpInvProductResponse.setName(thrInvProductsEntity.getInventoryName()); + erpProductsMap.put(thrInvProductsEntity.getInventoryCode(), erpProductsResponse); + addRl(erpInvProductResponse, combineRequest.getThirdSys(), erpProductsMap); + } else { + errMsg = "部分未找到库存信息无法添加!"; + } + } + } else { + UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); + BeanUtils.copyProperties(thrProductsEntity, udiInfoEntity); + udiInfoEntity.setNameCode(thrProductsEntity.getCode()); + udiInfoEntity.setCpmctymc(thrProductsEntity.getName()); + udiInfoEntity.setManufactory(thrProductsEntity.getManufactory()); + udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory()); + udiInfoEntity.setGgxh(thrProductsEntity.getSpec()); + udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo()); + udiInfoEntity.setUuid(CustomUtil.getUUId()); + udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); + udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN); + udiInfoService.insertUdiInfo(udiInfoEntity); + udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid()); + udiRelevanceEntity1.setThirdName(thrProductsEntity.getName()); + udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceService.insertUdiRelevance(udiRelevanceEntity1); + } + } + } + } + return errMsg; + } + public void addRl(ErpInvProductResponse onhandQueryResponse, String thirdSysId, Map erpProductsMap) { UdiInfoEntity udiInfoEntity = new UdiInfoEntity(); @@ -169,7 +226,8 @@ public class BasicUpdateProductService { udiInfoEntity.setCpmctymc(onhandQueryResponse.getName()); udiInfoEntity.setGgxh(onhandQueryResponse.getSpec()); udiInfoEntity.setUuid(CustomUtil.getUUId()); - udiInfoEntity.setDiType(1); + udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD); + udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN); udiInfoEntity.setManufactory(erpProductsMap.get(onhandQueryResponse.getCode()).getManufactory()); udiInfoEntity.setYlqxzcrbarmc(erpProductsMap.get(onhandQueryResponse.getCode()).getManufactory()); udiInfoEntity.setZczbhhzbapzbh(erpProductsMap.get(onhandQueryResponse.getCode()).getRegisterNo()); diff --git a/api-admin/src/main/resources/application-dev.properties b/api-admin/src/main/resources/application-dev.properties index 4fb64358..d8ee15ef 100644 --- a/api-admin/src/main/resources/application-dev.properties +++ b/api-admin/src/main/resources/application-dev.properties @@ -1,11 +1,11 @@ # 本地环境 server.port=9991 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -#spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_new?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true +#spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms_new?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true spring.datasource.username=root -#spring.datasource.password=123456 -spring.datasource.password=root +spring.datasource.password=123456 +#spring.datasource.password=root server.servlet.context-path= logging.level.com.glxp.api.admin.dao=debug diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml index 43a1a8e1..53042951 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoDao.xml @@ -46,7 +46,7 @@ nameCode,packRatio,packLevel,bhxjsl, bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey, cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber - ,diType + ,diType,productType ) values ( @@ -72,7 +72,8 @@ #{uuid}, #{sjcpbm}, #{versionNumber}, - #{diType} + #{diType}, + #{productType} ) @@ -82,7 +83,7 @@ nameCode,packRatio,packLevel,bhxjsl, bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey, cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber - ,diType + ,diType,productType ) values @@ -111,7 +112,8 @@ #{item.uuid}, #{item.sjcpbm}, #{item.versionNumber}, - #{item.diType} + #{item.diType}, + #{item.productType} ) @@ -152,6 +154,8 @@ ybbm=#{ybbm}, measname=#{measname}, diType=#{diType}, + productType=#{productType}, + WHERE nameCode = #{nameCode} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index 702981ee..8cbe4b9d 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -20,6 +20,7 @@ basic_products.flbm,basic_products.ggxh,basic_products.qxlb,basic_products.tyshxydm, basic_products.ylqxzcrbarmc,basic_products.zczbhhzbapzbh,basic_products.ylqxzcrbarywmc, basic_products.sydycpbs,basic_products.uuid,basic_products.sjcpbm,basic_products.versionNumber,basic_products.diType + ,basic_products.productType FROM basic_udirel inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml index 89801e13..a68ec5a4 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpImportLogDao.xml @@ -16,6 +16,9 @@ AND status = #{status} + + AND thirdSysFk = #{thirdSysFk} + ORDER BY updateTime DESC diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml index 8db1b26b..efe9e7c8 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsDao.xml @@ -13,8 +13,11 @@ AND inventoryName LIKE concat('%',#{inventoryName},'%') - - AND inventoryName LIKE concat('%',#{inventoryName},'%') + + AND count 0 + + + AND count ]]> 0 AND spec LIKE concat('%',#{spec},'%') @@ -25,6 +28,9 @@ AND manufactory LIKE concat('%',#{manufactory},'%') + + AND thirdSysFk = #{thirdSysFk} + ORDER BY updateTime DESC diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml index 9a222d09..5e9d4c2f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrInvProductsImportLogDao.xml @@ -16,6 +16,9 @@ AND status = #{status} + + AND thirdSysFk = #{thirdSysFk} + ORDER BY updateTime DESC diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml index 62bd0c6e..d06df015 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportLogDao.xml @@ -16,6 +16,9 @@ AND status = #{status} + + AND thirdSysFk = #{thirdSysFk} + ORDER BY updateTime DESC diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml index af6cea0f..7a30ae16 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrProductsImportLogDao.xml @@ -16,6 +16,9 @@ AND status = #{status} + + AND thirdSysFk = #{thirdSysFk} + ORDER BY updateTime DESC diff --git a/api-admin/target/classes/META-INF/api-admin.kotlin_module b/api-admin/target/classes/META-INF/api-admin.kotlin_module deleted file mode 100644 index 8fb60192..00000000 Binary files a/api-admin/target/classes/META-INF/api-admin.kotlin_module and /dev/null differ diff --git a/api-admin/target/classes/META-INF/spring-configuration-metadata.json b/api-admin/target/classes/META-INF/spring-configuration-metadata.json deleted file mode 100644 index c5335ca9..00000000 --- a/api-admin/target/classes/META-INF/spring-configuration-metadata.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "groups": [ - { - "name": "cors", - "type": "com.glxp.api.admin.config.CorsConfig", - "sourceType": "com.glxp.api.admin.config.CorsConfig" - }, - { - "name": "public-file", - "type": "com.glxp.api.admin.config.PublicFileUrlConfig", - "sourceType": "com.glxp.api.admin.config.PublicFileUrlConfig" - }, - { - "name": "spring.datasource", - "type": "javax.sql.DataSource", - "sourceType": "com.glxp.api.admin.config.MasterDataSourceConfig", - "sourceMethod": "masterDataSource()" - } - ], - "properties": [ - { - "name": "cors.allowed-headers", - "type": "java.lang.String", - "sourceType": "com.glxp.api.admin.config.CorsConfig" - }, - { - "name": "cors.allowed-methods", - "type": "java.lang.String", - "sourceType": "com.glxp.api.admin.config.CorsConfig" - }, - { - "name": "cors.allowed-origins", - "type": "java.lang.String", - "sourceType": "com.glxp.api.admin.config.CorsConfig" - } - ], - "hints": [] -} \ No newline at end of file diff --git a/api-admin/target/classes/application-dev.properties b/api-admin/target/classes/application-dev.properties deleted file mode 100644 index 6e77cf8a..00000000 --- a/api-admin/target/classes/application-dev.properties +++ /dev/null @@ -1,26 +0,0 @@ -# 本地环境 -server.port=9991 -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver -spring.datasource.jdbc-url=jdbc:mysql://127.0.0.1:3306/udiwms?serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true -spring.datasource.username=root -spring.datasource.password=123456 -#spring.datasource.password=mysql80 -server.servlet.context-path= - -logging.level.com.glxp.api.admin.dao=debug -logging.level.com.glxp.api.admin.erp.second=debug - -#logback配置 - -logging.path=output/logs -# 不指定的情况下默认生成在项目根目录,按照配置生成所需的日志名称 -logging.file=D:/udi.log -#UDI数据下载 -UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server -#UDI_SERVER_URL=http://139.9.178.73:8080/UDI_DL_Server -#UCLOD服务 -#UCLOD_SERVER_URL=http://127.0.0.1:9997 -UCLOD_SERVER_URL=http://127.0.0.1:8080/UDIC_UCLOUD_SERVER - - - diff --git a/api-admin/target/classes/application.properties b/api-admin/target/classes/application.properties deleted file mode 100644 index e487e916..00000000 --- a/api-admin/target/classes/application.properties +++ /dev/null @@ -1,8 +0,0 @@ -spring.profiles.active=dev - -spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver - -mybatis.config-location=classpath:mybatis/mybatis-config.xml -mybatis.mapper-locations=classpath:mybatis/mapper/*/*.xml - -spring.jmx.enabled=false \ No newline at end of file diff --git a/api-admin/target/classes/com/glxp/api/ApiAdminApplication.class b/api-admin/target/classes/com/glxp/api/ApiAdminApplication.class deleted file mode 100644 index d2c9e8ea..00000000 Binary files a/api-admin/target/classes/com/glxp/api/ApiAdminApplication.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/annotation/AuthRuleAnnotation.class b/api-admin/target/classes/com/glxp/api/admin/annotation/AuthRuleAnnotation.class deleted file mode 100644 index cd34f89b..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/annotation/AuthRuleAnnotation.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/aspect/AuthorizeAspect.class b/api-admin/target/classes/com/glxp/api/admin/aspect/AuthorizeAspect.class deleted file mode 100644 index e1c51857..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/aspect/AuthorizeAspect.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/CorsConfig.class b/api-admin/target/classes/com/glxp/api/admin/config/CorsConfig.class deleted file mode 100644 index 2eaa1608..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/config/CorsConfig.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/CorsFilter.class b/api-admin/target/classes/com/glxp/api/admin/config/CorsFilter.class deleted file mode 100644 index df5544fc..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/config/CorsFilter.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/DruidStatFilter.class b/api-admin/target/classes/com/glxp/api/admin/config/DruidStatFilter.class deleted file mode 100644 index 283ac219..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/config/DruidStatFilter.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/DruidStatViewServlet.class b/api-admin/target/classes/com/glxp/api/admin/config/DruidStatViewServlet.class deleted file mode 100644 index f9103881..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/config/DruidStatViewServlet.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/MasterDataSourceConfig.class b/api-admin/target/classes/com/glxp/api/admin/config/MasterDataSourceConfig.class deleted file mode 100644 index c99250ff..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/config/MasterDataSourceConfig.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/PageHelperConfig.class b/api-admin/target/classes/com/glxp/api/admin/config/PageHelperConfig.class deleted file mode 100644 index 9bba844e..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/config/PageHelperConfig.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/PublicFileUrlConfig.class b/api-admin/target/classes/com/glxp/api/admin/config/PublicFileUrlConfig.class deleted file mode 100644 index 026cc9cc..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/config/PublicFileUrlConfig.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/config/WebMvcConfig.class b/api-admin/target/classes/com/glxp/api/admin/config/WebMvcConfig.class deleted file mode 100644 index 677c3d07..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/config/WebMvcConfig.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/constant/BussinessTypeUtils.class b/api-admin/target/classes/com/glxp/api/admin/constant/BussinessTypeUtils.class deleted file mode 100644 index cca5b133..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/constant/BussinessTypeUtils.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/constant/ConstantStatus.class b/api-admin/target/classes/com/glxp/api/admin/constant/ConstantStatus.class deleted file mode 100644 index 66e611a7..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/constant/ConstantStatus.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/constant/ConstantType.class b/api-admin/target/classes/com/glxp/api/admin/constant/ConstantType.class deleted file mode 100644 index 9e50edad..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/constant/ConstantType.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthAdminController.class b/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthAdminController.class deleted file mode 100644 index 13ba4aae..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthAdminController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthPermissionRuleController.class b/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthPermissionRuleController.class deleted file mode 100644 index 8f3c9a50..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthPermissionRuleController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthRoleController.class b/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthRoleController.class deleted file mode 100644 index dee23054..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/auth/AuthRoleController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/auth/LoginController.class b/api-admin/target/classes/com/glxp/api/admin/controller/auth/LoginController.class deleted file mode 100644 index 97ec6890..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/auth/LoginController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.class b/api-admin/target/classes/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.class deleted file mode 100644 index 3076ed16..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/basic/BussinessTypeController.class b/api-admin/target/classes/com/glxp/api/admin/controller/basic/BussinessTypeController.class deleted file mode 100644 index 9de11442..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/basic/BussinessTypeController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/basic/UdiInfoController.class b/api-admin/target/classes/com/glxp/api/admin/controller/basic/UdiInfoController.class deleted file mode 100644 index b710fbd0..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/basic/UdiInfoController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/basic/UdiRelevanceController.class b/api-admin/target/classes/com/glxp/api/admin/controller/basic/UdiRelevanceController.class deleted file mode 100644 index b89b73d8..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/basic/UdiRelevanceController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/info/CompanyController.class b/api-admin/target/classes/com/glxp/api/admin/controller/info/CompanyController.class deleted file mode 100644 index f57dcdda..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/info/CompanyController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/info/SetupController.class b/api-admin/target/classes/com/glxp/api/admin/controller/info/SetupController.class deleted file mode 100644 index c1541e2a..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/info/SetupController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/info/SystemParamConfigController.class b/api-admin/target/classes/com/glxp/api/admin/controller/info/SystemParamConfigController.class deleted file mode 100644 index 3a8d5d38..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/info/SystemParamConfigController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/OrderController.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/OrderController.class deleted file mode 100644 index 5b967bc9..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/inout/OrderController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/OrderDetailController.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/OrderDetailController.class deleted file mode 100644 index 2130f8a2..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/inout/OrderDetailController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/UdiTraceController.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/UdiTraceController.class deleted file mode 100644 index 119b3136..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/inout/UdiTraceController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/WareHouseController.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/WareHouseController.class deleted file mode 100644 index 5f8c97f1..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/inout/WareHouseController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.class deleted file mode 100644 index bcd4fdee..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/DataTransUtil.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/DataTransUtil.class deleted file mode 100644 index d2e49160..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/DataTransUtil.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/InoutUtils.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/InoutUtils.class deleted file mode 100644 index 3ab9dfdd..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/InoutUtils.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/TransInoutUtil.class b/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/TransInoutUtil.class deleted file mode 100644 index 8b92a399..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/inout/utils/TransInoutUtil.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvCheckController.class b/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvCheckController.class deleted file mode 100644 index 0b021aef..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvCheckController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvErpOnhandController$1.class b/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvErpOnhandController$1.class deleted file mode 100644 index 43985967..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvErpOnhandController$1.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvErpOnhandController.class b/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvErpOnhandController.class deleted file mode 100644 index 1d462251..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvErpOnhandController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvPrintController.class b/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvPrintController.class deleted file mode 100644 index 557e2bcc..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/controller/inventory/InvPrintController.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthAdminDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthAdminDao.class deleted file mode 100644 index 1c4e8a03..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthAdminDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthPermissionDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthPermissionDao.class deleted file mode 100644 index b864e1a6..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthPermissionDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthPermissionRuleDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthPermissionRuleDao.class deleted file mode 100644 index 48d35122..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthPermissionRuleDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthRoleAdminDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthRoleAdminDao.class deleted file mode 100644 index 32a83786..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthRoleAdminDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthRoleDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthRoleDao.class deleted file mode 100644 index 39261863..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/auth/AuthRoleDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.class deleted file mode 100644 index 3661e648..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/basic/BasicUnitMaintainDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/basic/BussinessTypeDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/basic/BussinessTypeDao.class deleted file mode 100644 index c1df76cc..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/basic/BussinessTypeDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/basic/UdiInfoDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/basic/UdiInfoDao.class deleted file mode 100644 index 459325a0..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/basic/UdiInfoDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/basic/UdiRelevanceDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/basic/UdiRelevanceDao.class deleted file mode 100644 index 5f6d9436..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/basic/UdiRelevanceDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/basic/UnitMaintainDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/basic/UnitMaintainDao.class deleted file mode 100644 index 09ba24e7..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/basic/UnitMaintainDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/info/CompanyDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/info/CompanyDao.class deleted file mode 100644 index 3ba22815..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/info/CompanyDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/info/ScheduledDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/info/ScheduledDao.class deleted file mode 100644 index 645f9355..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/info/ScheduledDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/info/SetupDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/info/SetupDao.class deleted file mode 100644 index 2c508ecc..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/info/SetupDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/info/SystemParamConfigDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/info/SystemParamConfigDao.class deleted file mode 100644 index a83bc372..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/info/SystemParamConfigDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/inout/CodesDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/inout/CodesDao.class deleted file mode 100644 index f063905b..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/inout/CodesDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/inout/CodesTempDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/inout/CodesTempDao.class deleted file mode 100644 index 2b6a715c..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/inout/CodesTempDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/inout/OrderDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/inout/OrderDao.class deleted file mode 100644 index 576162d4..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/inout/OrderDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/inout/OrderDetailDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/inout/OrderDetailDao.class deleted file mode 100644 index 85ab8e92..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/inout/OrderDetailDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvErpStockDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvErpStockDao.class deleted file mode 100644 index 46e65c26..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvErpStockDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.class deleted file mode 100644 index 3a68d86f..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvOrderCheckDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvStockPrintDao.class b/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvStockPrintDao.class deleted file mode 100644 index 4677c73d..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/dao/inventory/InvStockPrintDao.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthAdmin.class b/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthAdmin.class deleted file mode 100644 index ad8c3850..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthAdmin.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthPermission.class b/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthPermission.class deleted file mode 100644 index d2cb260e..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthPermission.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthPermissionRule.class b/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthPermissionRule.class deleted file mode 100644 index ded96602..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthPermissionRule.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthRole.class b/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthRole.class deleted file mode 100644 index 2b468122..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthRole.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthRoleAdmin.class b/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthRoleAdmin.class deleted file mode 100644 index f0993219..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/auth/AuthRoleAdmin.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.class deleted file mode 100644 index 66279d2b..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/basic/BasicUnitMaintainEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/BussinessTypeEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/BussinessTypeEntity.class deleted file mode 100644 index ed6f879e..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/basic/BussinessTypeEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/ErpStockEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/ErpStockEntity.class deleted file mode 100644 index ab9fd45c..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/basic/ErpStockEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/StockPrintEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/StockPrintEntity.class deleted file mode 100644 index 8ca1bb17..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/basic/StockPrintEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiEntity.class deleted file mode 100644 index 63169364..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiInfoEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiInfoEntity.class deleted file mode 100644 index d269d3bc..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiInfoEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.class deleted file mode 100644 index 190f86b3..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/basic/UdiRelevanceEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/basic/UnitMaintainEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/basic/UnitMaintainEntity.class deleted file mode 100644 index 0492a743..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/basic/UnitMaintainEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/info/CompanyEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/info/CompanyEntity.class deleted file mode 100644 index cc63a29f..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/info/CompanyEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/info/MipsServiceEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/info/MipsServiceEntity.class deleted file mode 100644 index 73669ecf..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/info/MipsServiceEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/info/ScheduledEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/info/ScheduledEntity.class deleted file mode 100644 index 8dac55d7..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/info/ScheduledEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/info/SetupEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/info/SetupEntity.class deleted file mode 100644 index c79faba6..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/info/SetupEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/info/SystemParamConfigEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/info/SystemParamConfigEntity.class deleted file mode 100644 index 47fead34..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/info/SystemParamConfigEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/ErpDetailCodeEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/ErpDetailCodeEntity.class deleted file mode 100644 index 1aeae177..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/inout/ErpDetailCodeEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/ErpOrderEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/ErpOrderEntity.class deleted file mode 100644 index a7266016..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/inout/ErpOrderEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.class deleted file mode 100644 index a0b569a8..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/MipsDrugEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/MipsDrugEntity.class deleted file mode 100644 index e15dea49..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/inout/MipsDrugEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/OrderDetailEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/OrderDetailEntity.class deleted file mode 100644 index 32c19394..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/inout/OrderDetailEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/OrderEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/OrderEntity.class deleted file mode 100644 index 10ad3d2c..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/inout/OrderEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/StockCheckEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/StockCheckEntity.class deleted file mode 100644 index 36bfc875..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/inout/StockCheckEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/Unit.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/Unit.class deleted file mode 100644 index 84d008bb..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/inout/Unit.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehouseEntity.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehouseEntity.class deleted file mode 100644 index eb9a6469..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehouseEntity.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/Warehousetemp.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/Warehousetemp.class deleted file mode 100644 index 80fc6721..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/inout/Warehousetemp.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$Criteria.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$Criteria.class deleted file mode 100644 index 33d85d47..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$Criteria.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$Criterion.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$Criterion.class deleted file mode 100644 index 5cf649f2..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$Criterion.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$GeneratedCriteria.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$GeneratedCriteria.class deleted file mode 100644 index 8d81cf90..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample$GeneratedCriteria.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample.class b/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample.class deleted file mode 100644 index 5444d9db..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/entity/inout/WarehousetempExample.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/exception/JsonException.class b/api-admin/target/classes/com/glxp/api/admin/exception/JsonException.class deleted file mode 100644 index 73317100..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/exception/JsonException.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/handler/GlobalExceptionHandler.class b/api-admin/target/classes/com/glxp/api/admin/handler/GlobalExceptionHandler.class deleted file mode 100644 index 724d53d7..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/handler/GlobalExceptionHandler.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpBasicClient$1.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpBasicClient$1.class deleted file mode 100644 index 59d26d55..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpBasicClient$1.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpBasicClient.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpBasicClient.class deleted file mode 100644 index 71128ae2..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpBasicClient.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpInvClient$1.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpInvClient$1.class deleted file mode 100644 index d2b9132c..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpInvClient$1.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpInvClient.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpInvClient.class deleted file mode 100644 index 0d8d3f6a..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpInvClient.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$1.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$1.class deleted file mode 100644 index c5418bcf..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$1.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$2.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$2.class deleted file mode 100644 index 484aff66..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$2.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$3.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$3.class deleted file mode 100644 index a82af823..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient$3.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient.class deleted file mode 100644 index 71612c69..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/httpclient/ErpOrderClient.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/UdiDlHttpClient$1.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/UdiDlHttpClient$1.class deleted file mode 100644 index 7854dc59..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/httpclient/UdiDlHttpClient$1.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/httpclient/UdiDlHttpClient.class b/api-admin/target/classes/com/glxp/api/admin/httpclient/UdiDlHttpClient.class deleted file mode 100644 index 1c7a5f9b..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/httpclient/UdiDlHttpClient.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/ListPageRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/ListPageRequest.class deleted file mode 100644 index 628119cb..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/ListPageRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.class deleted file mode 100644 index c23f93c2..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthAdminQueryRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.class deleted file mode 100644 index 6c75ef17..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthAdminSaveRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthPermissionRuleSaveRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthPermissionRuleSaveRequest.class deleted file mode 100644 index 5de3f6e8..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthPermissionRuleSaveRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleAuthRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleAuthRequest.class deleted file mode 100644 index d22bd22d..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleAuthRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleQueryRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleQueryRequest.class deleted file mode 100644 index 0f305f17..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleQueryRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleSaveRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleSaveRequest.class deleted file mode 100644 index 5f8bcf36..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/auth/AuthRoleSaveRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/LoginRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/LoginRequest.class deleted file mode 100644 index 903ef1c3..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/auth/LoginRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/auth/UpdatePasswordRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/auth/UpdatePasswordRequest.class deleted file mode 100644 index f64c6f7e..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/auth/UpdatePasswordRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.class deleted file mode 100644 index dc757676..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/BasicUnitMaintainSaveRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/BasicUnitMaintainSaveRequest.class deleted file mode 100644 index 7447bf07..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/basic/BasicUnitMaintainSaveRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/CombineRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/CombineRequest.class deleted file mode 100644 index 5aae1bd5..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/basic/CombineRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.class deleted file mode 100644 index 37bb2cfd..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterStockprintRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterStockprintRequest.class deleted file mode 100644 index 5522dda6..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterStockprintRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.class deleted file mode 100644 index 93b98814..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/UOnhandQueryRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/UOnhandQueryRequest.class deleted file mode 100644 index 0cd47e8f..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/basic/UOnhandQueryRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/basic/UpdatePrintStatusRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/basic/UpdatePrintStatusRequest.class deleted file mode 100644 index b06c4504..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/basic/UpdatePrintStatusRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/info/FilterSetupRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/info/FilterSetupRequest.class deleted file mode 100644 index 01db233f..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/info/FilterSetupRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/info/SystemParamConfigRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/info/SystemParamConfigRequest.class deleted file mode 100644 index 19394310..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/info/SystemParamConfigRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/info/SystemParamConfigSaveRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/info/SystemParamConfigSaveRequest.class deleted file mode 100644 index 10d3497f..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/info/SystemParamConfigSaveRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/CommitRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/CommitRequest.class deleted file mode 100644 index 66e36094..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/CommitRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/DeleteCodeRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/DeleteCodeRequest.class deleted file mode 100644 index fabe2eb6..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/DeleteCodeRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/DeleteRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/DeleteRequest.class deleted file mode 100644 index b4d21e4e..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/DeleteRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/ERPPostBillRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/ERPPostBillRequest.class deleted file mode 100644 index 5a31ec0e..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/ERPPostBillRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/FilterOrderRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/FilterOrderRequest.class deleted file mode 100644 index 1749e423..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/FilterOrderRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/FilterStockCheckRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/FilterStockCheckRequest.class deleted file mode 100644 index 281290fe..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/FilterStockCheckRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/ImportErpOrderRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/ImportErpOrderRequest.class deleted file mode 100644 index de5ef303..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/ImportErpOrderRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderFilterByCodeRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderFilterByCodeRequest.class deleted file mode 100644 index decd2fc8..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderFilterByCodeRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderFilterRequest.class deleted file mode 100644 index 4e37a566..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderFilterRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderMergeRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderMergeRequest.class deleted file mode 100644 index 7888dce0..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderMergeRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderQueryRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderQueryRequest.class deleted file mode 100644 index 0e72b4ab..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/OrderQueryRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/PostOrderRequest$PostOrder.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/PostOrderRequest$PostOrder.class deleted file mode 100644 index f83b9ce0..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/PostOrderRequest$PostOrder.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/PostOrderRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/PostOrderRequest.class deleted file mode 100644 index 2b259b0b..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/PostOrderRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/USignRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/USignRequest.class deleted file mode 100644 index 40076b40..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/USignRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/UpdateExportStatusRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/UpdateExportStatusRequest.class deleted file mode 100644 index 5531d324..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/UpdateExportStatusRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/WarehouseQueryRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/WarehouseQueryRequest.class deleted file mode 100644 index 76fff6bd..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/WarehouseQueryRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inout/WarehouseSaveRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inout/WarehouseSaveRequest.class deleted file mode 100644 index 032e5596..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inout/WarehouseSaveRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/inventory/ErpOnhandRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/inventory/ErpOnhandRequest.class deleted file mode 100644 index 8a34a446..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/inventory/ErpOnhandRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/AddReceiptRequest$ReceiptRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/AddReceiptRequest$ReceiptRequest.class deleted file mode 100644 index a0cf7423..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/receipt/AddReceiptRequest$ReceiptRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/AddReceiptRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/AddReceiptRequest.class deleted file mode 100644 index ed6cb184..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/receipt/AddReceiptRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.class deleted file mode 100644 index 912ce74c..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ClearStockRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ClearStockRequest.class deleted file mode 100644 index 32f19e1d..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ClearStockRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/CodeDetailRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/CodeDetailRequest.class deleted file mode 100644 index 37ace76d..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/receipt/CodeDetailRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/CombineUnitRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/CombineUnitRequest.class deleted file mode 100644 index b7335e42..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/receipt/CombineUnitRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ManuorderFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ManuorderFilterRequest.class deleted file mode 100644 index 31de71d2..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ManuorderFilterRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ProductFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ProductFilterRequest.class deleted file mode 100644 index 037f3b82..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ProductFilterRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ProductInfoFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ProductInfoFilterRequest.class deleted file mode 100644 index 89ccd849..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ProductInfoFilterRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ReceiptDetailRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ReceiptDetailRequest.class deleted file mode 100644 index c51d3b37..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ReceiptDetailRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ReceiptFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/ReceiptFilterRequest.class deleted file mode 100644 index db2e4265..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/receipt/ReceiptFilterRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/U8Request.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/U8Request.class deleted file mode 100644 index 3527fc7f..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/receipt/U8Request.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.class deleted file mode 100644 index 47e77da9..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/receipt/UnitMaintainFilterRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/req/udid/ScheduledRequest.class b/api-admin/target/classes/com/glxp/api/admin/req/udid/ScheduledRequest.class deleted file mode 100644 index 274a5408..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/req/udid/ScheduledRequest.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/PageSimpleResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/PageSimpleResponse.class deleted file mode 100644 index d7b36139..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/PageSimpleResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthAdminResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthAdminResponse.class deleted file mode 100644 index af8bdca4..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthAdminResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthAdminRoleResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthAdminRoleResponse.class deleted file mode 100644 index 0a4d9bae..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthAdminRoleResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthPermissionRuleMergeResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthPermissionRuleMergeResponse.class deleted file mode 100644 index c5554377..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthPermissionRuleMergeResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthRoleResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthRoleResponse.class deleted file mode 100644 index 023b9141..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/auth/AuthRoleResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/auth/LoginUserInfoResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/auth/LoginUserInfoResponse.class deleted file mode 100644 index 0995eea2..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/auth/LoginUserInfoResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.class deleted file mode 100644 index 8abcb926..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/basic/BasicUnitMaintainResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/basic/ErpProductsResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/basic/ErpProductsResponse.class deleted file mode 100644 index e867b83a..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/basic/ErpProductsResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/basic/ErpUnitsResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/basic/ErpUnitsResponse.class deleted file mode 100644 index 2f049389..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/basic/ErpUnitsResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/basic/UOnhandQueryResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/basic/UOnhandQueryResponse.class deleted file mode 100644 index faa181a8..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/basic/UOnhandQueryResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/basic/UdiRelevanceResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/basic/UdiRelevanceResponse.class deleted file mode 100644 index ffa2a870..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/basic/UdiRelevanceResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/basic/UdiTraceResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/basic/UdiTraceResponse.class deleted file mode 100644 index e4ed7849..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/basic/UdiTraceResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/info/SystemParamConfigResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/info/SystemParamConfigResponse.class deleted file mode 100644 index e8bb2450..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/info/SystemParamConfigResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/inout/ErpOrderResponse$SubErpOrder.class b/api-admin/target/classes/com/glxp/api/admin/res/inout/ErpOrderResponse$SubErpOrder.class deleted file mode 100644 index 7c5f79a2..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/inout/ErpOrderResponse$SubErpOrder.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/inout/ErpOrderResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/inout/ErpOrderResponse.class deleted file mode 100644 index 718b2d98..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/inout/ErpOrderResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/inout/InvmandocResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/inout/InvmandocResponse.class deleted file mode 100644 index ec3beb85..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/inout/InvmandocResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/inout/PurchaseinResponse$SubPurchase.class b/api-admin/target/classes/com/glxp/api/admin/res/inout/PurchaseinResponse$SubPurchase.class deleted file mode 100644 index db87c3b3..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/inout/PurchaseinResponse$SubPurchase.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/inout/PurchaseinResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/inout/PurchaseinResponse.class deleted file mode 100644 index d4f6da49..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/inout/PurchaseinResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/inout/WarehouseResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/inout/WarehouseResponse.class deleted file mode 100644 index 44d3d5c7..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/inout/WarehouseResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/res/inventory/ErpOnHandResponse.class b/api-admin/target/classes/com/glxp/api/admin/res/inventory/ErpOnHandResponse.class deleted file mode 100644 index 8d1738cb..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/res/inventory/ErpOnHandResponse.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthAdminService.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthAdminService.class deleted file mode 100644 index 6ff49e29..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthAdminService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthLoginService.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthLoginService.class deleted file mode 100644 index b211236c..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthLoginService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthPermissionRuleService.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthPermissionRuleService.class deleted file mode 100644 index d9ab6181..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthPermissionRuleService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthPermissionService.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthPermissionService.class deleted file mode 100644 index e68bd231..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthPermissionService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthRoleAdminService.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthRoleAdminService.class deleted file mode 100644 index 3d670205..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthRoleAdminService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthRoleService.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthRoleService.class deleted file mode 100644 index 8fcbb23f..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/auth/AuthRoleService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImpl.class deleted file mode 100644 index 00f97040..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImpl.class deleted file mode 100644 index 73826665..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImpl.class deleted file mode 100644 index 755552eb..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthPermissionServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthPermissionServiceImpl.class deleted file mode 100644 index 5da1896d..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthPermissionServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImpl.class deleted file mode 100644 index d351d101..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImpl.class deleted file mode 100644 index 96eddd6e..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/BasicUnitMaintainService.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/BasicUnitMaintainService.class deleted file mode 100644 index bad8b7ef..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/basic/BasicUnitMaintainService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/BussinessTypeService.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/BussinessTypeService.class deleted file mode 100644 index 1fce8b85..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/basic/BussinessTypeService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/UdiInfoService.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/UdiInfoService.class deleted file mode 100644 index 44a4d012..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/basic/UdiInfoService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/UdiRelevanceService.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/UdiRelevanceService.class deleted file mode 100644 index 48f96deb..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/basic/UdiRelevanceService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/UnitMaintainService.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/UnitMaintainService.class deleted file mode 100644 index c3a97b1a..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/basic/UnitMaintainService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.class deleted file mode 100644 index 7d91945b..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/BasicUnitMaintainServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.class deleted file mode 100644 index 873664ad..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/BussinessTypeServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.class deleted file mode 100644 index 2fba91e0..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.class deleted file mode 100644 index c394f567..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.class deleted file mode 100644 index d10fc8e4..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/basic/impl/UnitMaintainServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/info/CompanyService.class b/api-admin/target/classes/com/glxp/api/admin/service/info/CompanyService.class deleted file mode 100644 index 38b31460..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/info/CompanyService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/info/SetupService.class b/api-admin/target/classes/com/glxp/api/admin/service/info/SetupService.class deleted file mode 100644 index 6ba226e3..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/info/SetupService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/info/SystemParamConfigService.class b/api-admin/target/classes/com/glxp/api/admin/service/info/SystemParamConfigService.class deleted file mode 100644 index e9ea63a5..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/info/SystemParamConfigService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/info/impl/CompanyServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/info/impl/CompanyServiceImpl.class deleted file mode 100644 index 68887bf0..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/info/impl/CompanyServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/info/impl/SetupServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/info/impl/SetupServiceImpl.class deleted file mode 100644 index cef689dc..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/info/impl/SetupServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.class deleted file mode 100644 index 190ba559..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/info/impl/SystemParamConfigServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/CodesService.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/CodesService.class deleted file mode 100644 index 8a656bc9..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/inout/CodesService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/CodesTempService.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/CodesTempService.class deleted file mode 100644 index e9e82c14..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/inout/CodesTempService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/OrderDetailService.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/OrderDetailService.class deleted file mode 100644 index 49142657..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/inout/OrderDetailService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/OrderService.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/OrderService.class deleted file mode 100644 index 502da50b..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/inout/OrderService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.class deleted file mode 100644 index 95804964..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/CodesServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/CodesTempServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/CodesTempServiceImpl.class deleted file mode 100644 index b132e651..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/CodesTempServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/OrderDetailServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/OrderDetailServiceImpl.class deleted file mode 100644 index db8e8145..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/OrderDetailServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.class deleted file mode 100644 index bc0560b2..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvErpStockService.class b/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvErpStockService.class deleted file mode 100644 index 031bb0da..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvErpStockService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvOrderCheckService.class b/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvOrderCheckService.class deleted file mode 100644 index ad11a162..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvOrderCheckService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvStockPrintService.class b/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvStockPrintService.class deleted file mode 100644 index 8381c470..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/inventory/InvStockPrintService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvErpStockServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvErpStockServiceImpl.class deleted file mode 100644 index 5415584f..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvErpStockServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvOrderCheckServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvOrderCheckServiceImpl.class deleted file mode 100644 index b6d4fb55..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvOrderCheckServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.class b/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.class deleted file mode 100644 index 15853fe1..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/BasicUpdateErpDataTask.class b/api-admin/target/classes/com/glxp/api/admin/thread/BasicUpdateErpDataTask.class deleted file mode 100644 index 3869f8d8..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/thread/BasicUpdateErpDataTask.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/BasicUpdateproductService.class b/api-admin/target/classes/com/glxp/api/admin/thread/BasicUpdateproductService.class deleted file mode 100644 index 360db9e1..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/thread/BasicUpdateproductService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvDlErpStockService.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvDlErpStockService.class deleted file mode 100644 index 0294eb3c..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/thread/InvDlErpStockService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvDlErpStockTask.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvDlErpStockTask.class deleted file mode 100644 index 6f8e146b..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/thread/InvDlErpStockTask.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$1.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$1.class deleted file mode 100644 index 6e1bf504..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$1.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$2.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$2.class deleted file mode 100644 index 9acd1f0d..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$2.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$3.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$3.class deleted file mode 100644 index 985ebf62..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService$3.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService.class deleted file mode 100644 index 9c300468..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/thread/InvImportStockService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvUpdateStock1Task.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvUpdateStock1Task.class deleted file mode 100644 index 2d215bfb..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/thread/InvUpdateStock1Task.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/InvUpdateStock2Task.class b/api-admin/target/classes/com/glxp/api/admin/thread/InvUpdateStock2Task.class deleted file mode 100644 index 9f6061c2..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/thread/InvUpdateStock2Task.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/IoModifyErpTask.class b/api-admin/target/classes/com/glxp/api/admin/thread/IoModifyErpTask.class deleted file mode 100644 index 60633921..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/thread/IoModifyErpTask.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/IoTransInoutService.class b/api-admin/target/classes/com/glxp/api/admin/thread/IoTransInoutService.class deleted file mode 100644 index 4f1ce643..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/thread/IoTransInoutService.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/IoTransInoutTask.class b/api-admin/target/classes/com/glxp/api/admin/thread/IoTransInoutTask.class deleted file mode 100644 index d0e09609..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/thread/IoTransInoutTask.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/TaskExecutorConfig$MyAsyncExceptionHandler.class b/api-admin/target/classes/com/glxp/api/admin/thread/TaskExecutorConfig$MyAsyncExceptionHandler.class deleted file mode 100644 index 7ba5c930..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/thread/TaskExecutorConfig$MyAsyncExceptionHandler.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/thread/TaskExecutorConfig.class b/api-admin/target/classes/com/glxp/api/admin/thread/TaskExecutorConfig.class deleted file mode 100644 index 6d41d1e9..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/thread/TaskExecutorConfig.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/CacheUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/CacheUtils.class deleted file mode 100644 index d8423320..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/CacheUtils.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/CheckUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/CheckUtils.class deleted file mode 100644 index 08e75cfd..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/CheckUtils.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/CustomUtil.class b/api-admin/target/classes/com/glxp/api/admin/util/CustomUtil.class deleted file mode 100644 index 2a3d1be1..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/CustomUtil.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/DateUtil.class b/api-admin/target/classes/com/glxp/api/admin/util/DateUtil.class deleted file mode 100644 index 1fcd735b..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/DateUtil.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/FastJsonUtils$1.class b/api-admin/target/classes/com/glxp/api/admin/util/FastJsonUtils$1.class deleted file mode 100644 index b3d0d565..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/FastJsonUtils$1.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/FastJsonUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/FastJsonUtils.class deleted file mode 100644 index 08065602..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/FastJsonUtils.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/FilterUdiUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/FilterUdiUtils.class deleted file mode 100644 index 0d827028..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/FilterUdiUtils.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/HttpClient.class b/api-admin/target/classes/com/glxp/api/admin/util/HttpClient.class deleted file mode 100644 index c2d3ee78..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/HttpClient.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/IpUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/IpUtils.class deleted file mode 100644 index 38980561..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/IpUtils.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/JwtUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/JwtUtils.class deleted file mode 100644 index 25fb2f9c..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/JwtUtils.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/Md5Utils.class b/api-admin/target/classes/com/glxp/api/admin/util/Md5Utils.class deleted file mode 100644 index 3146ba81..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/Md5Utils.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/PasswordUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/PasswordUtils.class deleted file mode 100644 index 8b5e2b29..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/PasswordUtils.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/PermissionRuleTreeUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/PermissionRuleTreeUtils.class deleted file mode 100644 index 8bfc2943..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/PermissionRuleTreeUtils.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/PublicFileUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/PublicFileUtils.class deleted file mode 100644 index 389e450c..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/PublicFileUtils.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/TreeUtils.class b/api-admin/target/classes/com/glxp/api/admin/util/TreeUtils.class deleted file mode 100644 index a4f2c825..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/TreeUtils.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/UdidConfig.class b/api-admin/target/classes/com/glxp/api/admin/util/UdidConfig.class deleted file mode 100644 index 927d4a05..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/UdidConfig.class and /dev/null differ diff --git a/api-admin/target/classes/com/glxp/api/admin/util/serializer/Date2LongSerializer.class b/api-admin/target/classes/com/glxp/api/admin/util/serializer/Date2LongSerializer.class deleted file mode 100644 index 607198f9..00000000 Binary files a/api-admin/target/classes/com/glxp/api/admin/util/serializer/Date2LongSerializer.class and /dev/null differ diff --git a/api-admin/target/classes/logback-spring.xml b/api-admin/target/classes/logback-spring.xml deleted file mode 100644 index daa05617..00000000 --- a/api-admin/target/classes/logback-spring.xml +++ /dev/null @@ -1,145 +0,0 @@ - - - logback - - - - - - %d{HH:mm:ss.SSS} %contextName [%thread] %-5level %logger{36} - %msg%n - - - - - - - - - - ${log.path}/web_debug.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - - ${log.path}/web-debug-%d{yyyy-MM-dd}.%i.log - - 40MB - - - 15 - - - - debug - ACCEPT - DENY - - - - - - - ${log.path}/web_info.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - - ${log.path}/web-info-%d{yyyy-MM-dd}.%i.log - - 40MB - - - 15 - - - - info - ACCEPT - DENY - - - - - - - ${log.path}/web_warn.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - ${log.path}/web-warn-%d{yyyy-MM-dd}.%i.log - - 40MB - - - 15 - - - - warn - ACCEPT - DENY - - - - - - - ${log.path}/web_error.log - - - %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n - UTF-8 - - - - ${log.path}/web-error-%d{yyyy-MM-dd}.%i.log - - 40MB - - - 15 - - - - ERROR - ACCEPT - DENY - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/configuration.xml b/api-admin/target/classes/mybatis/configuration.xml deleted file mode 100644 index 771e01b3..00000000 --- a/api-admin/target/classes/mybatis/configuration.xml +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- -
-
\ No newline at end of file diff --git a/api-admin/target/classes/mybatis/db.properties b/api-admin/target/classes/mybatis/db.properties deleted file mode 100644 index 8caaaaff..00000000 --- a/api-admin/target/classes/mybatis/db.properties +++ /dev/null @@ -1,5 +0,0 @@ -jdbc.jar.path=D:/Program Files/maven/maven-repository/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21.jar -jdbc.driver=com.mysql.cj.jdbc.Driver -jdbc.url=jdbc:mysql://127.0.0.1:3306/warehouse?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&useSSL=false -jdbc.username=root -jdbc.password=123456 \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/auth/AuthAdminDao.xml b/api-admin/target/classes/mybatis/mapper/auth/AuthAdminDao.xml deleted file mode 100644 index 38549386..00000000 --- a/api-admin/target/classes/mybatis/mapper/auth/AuthAdminDao.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - INSERT INTO auth_user(userName,passWord,lastLoginIp,lastLoginTime,createTime,userFlag,employeeName) - values - (#{userName}, - - - #{passWord}, - - - '', - - - - - - - #{lastLoginIp}, - - - '', - - - - - #{lastLoginTime}, - - - '0001-01-01 00:00:00', - - - #{createTime}, - #{userFlag,jdbcType=INTEGER}, - #{employeeName}) - - - - UPDATE auth_user - - userName=#{userName}, - passWord=#{passWord}, - lastLoginIp=#{lastLoginIp}, - lastLoginTime=#{lastLoginTime}, - userFlag=#{userFlag}, - employeeName=#{employeeName} - - WHERE id=#{id} - - - - delete from auth_user where id = #{id} - - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/auth/AuthPermissionDao.xml b/api-admin/target/classes/mybatis/mapper/auth/AuthPermissionDao.xml deleted file mode 100644 index 199cd862..00000000 --- a/api-admin/target/classes/mybatis/mapper/auth/AuthPermissionDao.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - INSERT INTO auth_permission - (roleId, permissionRuleId,`type`) - VALUES - - - (#{item.roleId}, #{item.permissionRuleId}, #{item.type}) - - - - - - - delete from auth_permission where roleId = #{roleId} - - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/auth/AuthPermissionRuleDao.xml b/api-admin/target/classes/mybatis/mapper/auth/AuthPermissionRuleDao.xml deleted file mode 100644 index 192b5680..00000000 --- a/api-admin/target/classes/mybatis/mapper/auth/AuthPermissionRuleDao.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - INSERT INTO auth_permission_rule(pid,`name`,`title`,`status`,`condition`,`listorder`,create_time,update_time) - values - (#{pid}, - #{name}, - #{title}, - #{status}, - - - #{condition}, - - - '', - - - #{listorder}, - #{createTime}, - #{updateTime}) - - - - UPDATE auth_permission_rule - - pid=#{pid}, - `name`=#{name}, - title=#{title}, - `status`=#{status}, - `condition`=#{condition}, - `listorder`=#{listorder}, - update_time=#{updateTime}, - - WHERE id=#{id} - - - - delete from auth_permission_rule where id = #{id} - - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/auth/AuthRoleAdminDao.xml b/api-admin/target/classes/mybatis/mapper/auth/AuthRoleAdminDao.xml deleted file mode 100644 index 91f75dcc..00000000 --- a/api-admin/target/classes/mybatis/mapper/auth/AuthRoleAdminDao.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - INSERT INTO auth_role_admin - (role_id, admin_id) - VALUES - - - (#{item.role_id}, #{item.admin_id}) - - - - - - delete from auth_role_admin where admin_id = #{adminId} - - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/auth/AuthRoleDao.xml b/api-admin/target/classes/mybatis/mapper/auth/AuthRoleDao.xml deleted file mode 100644 index ca9ed9cb..00000000 --- a/api-admin/target/classes/mybatis/mapper/auth/AuthRoleDao.xml +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - INSERT INTO auth_role(`name`,pid,`status`,`remark`,`listorder`,create_time,update_time) - values - ( - #{name}, - - - #{pid}, - - - 0, - - - #{status}, - - - #{remark}, - - - '', - - - - - #{listorder}, - - - 999, - - - #{createTime}, - #{updateTime} - ) - - - - UPDATE auth_role - - `name`=#{name}, - pid=#{pid}, - `status`=#{status}, - remark=#{remark}, - `listorder`=#{listorder}, - update_time=#{updateTime}, - - WHERE id=#{id} - - - - delete from auth_role where id = #{id} - - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/api-admin/target/classes/mybatis/mapper/basic/BasicUnitMaintainDao.xml deleted file mode 100644 index 7e52c3a6..00000000 --- a/api-admin/target/classes/mybatis/mapper/basic/BasicUnitMaintainDao.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - INSERT INTO basic_corp - (thirdId,erpId,name,spell, - addr,status,type,creditNo,contact,mobile) - values - ( - #{thirdId}, - #{erpId}, - #{name}, - #{spell}, - #{addr}, - #{status}, - #{type}, - #{creditNo}, - #{contact}, - #{mobile} - ) - - - - insert INTO basic_corp( - thirdId,erpId,name,spell,addr, - status,type,creditNo,contact,mobile - ) values - ( - #{thirdId}, - #{erpId}, - #{name}, - #{spell}, - #{addr}, - #{status}, - #{type}, - #{creditNo}, - #{contact}, - #{mobile} - ) - - - - UPDATE basic_corp - - thirdId=#{thirdId}, - erpId=#{erpId}, - name=#{name}, - spell=#{spell}, - addr=#{addr}, - status=#{status}, - type=#{type}, - creditNo=#{creditNo}, - contact=#{contact}, - mobile=#{mobile}, - - WHERE id=#{id} - - - - DELETE FROM basic_corp WHERE id = #{id} - - - - - diff --git a/api-admin/target/classes/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/target/classes/mybatis/mapper/basic/BussinessTypeDao.xml deleted file mode 100644 index 7e9ec433..00000000 --- a/api-admin/target/classes/mybatis/mapper/basic/BussinessTypeDao.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - INSERT INTO basic_bussiness_type - (action,name,enable,remark,mainAction) - values - ( - #{action}, - #{name}, - #{enable}, - #{remark}, - #{mainAction} - ) - - - - UPDATE basic_bussiness_type SET - action = #{action}, - name = #{name}, - enable = #{enable}, - remark = #{remark} - mainAction = #{mainAction} - WHERE id = #{id} - - - - DELETE FROM basic_bussiness_type WHERE id = #{id} - - - - - diff --git a/api-admin/target/classes/mybatis/mapper/basic/UdiInfoDao.xml b/api-admin/target/classes/mybatis/mapper/basic/UdiInfoDao.xml deleted file mode 100644 index 18e30a35..00000000 --- a/api-admin/target/classes/mybatis/mapper/basic/UdiInfoDao.xml +++ /dev/null @@ -1,154 +0,0 @@ - - - - - - - - - - - - - - replace INTO basic_products - ( - nameCode,packRatio,packLevel,bhxjsl, - bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey, - cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber - ,diType - ) - values - ( - #{nameCode}, - #{packRatio}, - #{packLevel}, - #{bhxjsl}, - #{bhzxxsbzsl}, - #{zxxsbzbhsydysl}, - #{bhxjcpbm}, - #{bzcj}, - #{addType}, - #{deviceRecordKey}, - #{cpmctymc}, - #{cplb}, - #{flbm}, - #{ggxh}, - #{qxlb}, - #{tyshxydm}, - #{ylqxzcrbarmc}, - #{zczbhhzbapzbh}, - #{ylqxzcrbarywmc}, - #{uuid}, - #{sjcpbm}, - #{versionNumber}, - #{diType} - ) - - - - replace INTO basic_products - ( - nameCode,packRatio,packLevel,bhxjsl, - bhzxxsbzsl,zxxsbzbhsydysl,bhxjcpbm,bzcj,addType,deviceRecordKey, - cpmctymc,cplb,flbm,ggxh,qxlb,tyshxydm,ylqxzcrbarmc,zczbhhzbapzbh,ylqxzcrbarywmc,uuid,sjcpbm,versionNumber - ,diType - ) - values - - - ( - #{item.nameCode}, - #{item.packRatio}, - #{item.packLevel}, - #{item.bhxjsl}, - #{item.bhzxxsbzsl}, - #{item.zxxsbzbhsydysl}, - #{item.bhxjcpbm}, - #{item.bzcj}, - #{item.addType}, - #{item.deviceRecordKey}, - #{item.cpmctymc}, - #{item.cplb}, - #{item.flbm}, - #{item.ggxh}, - #{item.qxlb}, - #{item.tyshxydm}, - #{item.ylqxzcrbarmc}, - #{item.zczbhhzbapzbh}, - #{item.ylqxzcrbarywmc}, - #{item.uuid}, - #{item.sjcpbm}, - #{item.versionNumber}, - #{item.diType} - ) - - - - - DELETE FROM basic_products WHERE id = #{id} - - - - DELETE FROM basic_products WHERE uuid = #{uuid} - - - - UPDATE basic_products - - packRatio=#{packRatio}, - packLevel=#{packLevel}, - bhxjsl=#{bhxjsl}, - bhzxxsbzsl=#{bhzxxsbzsl}, - zxxsbzbhsydysl=#{zxxsbzbhsydysl}, - bhxjcpbm=#{bhxjcpbm}, - bzcj=#{bzcj}, - addType=#{addType}, - deviceRecordKey=#{deviceRecordKey}, - cpmctymc=#{cpmctymc}, - cplb=#{cplb}, - flbm=#{flbm}, - ggxh=#{ggxh}, - qxlb=#{qxlb}, - tyshxydm=#{tyshxydm}, - ylqxzcrbarmc=#{ylqxzcrbarmc}, - ylqxzcrbarywmc=#{ylqxzcrbarywmc}, - uuid=#{uuid}, - sjcpbm=#{sjcpbm}, - versionNumber=#{versionNumber}, - diType=#{diType}, - - WHERE nameCode = #{nameCode} - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/basic/UdiRelevanceDao.xml b/api-admin/target/classes/mybatis/mapper/basic/UdiRelevanceDao.xml deleted file mode 100644 index cbf199b0..00000000 --- a/api-admin/target/classes/mybatis/mapper/basic/UdiRelevanceDao.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - replace INTO basic_udirel - ( - thirdId,thirdName,uuid,isUseDy,updateTime,batchNo,warehouseName - ) - values - ( - #{thirdId}, - #{thirdName}, - #{uuid}, - #{isUseDy}, - #{updateTime}, - #{batchNo}, - #{warehouseName} - ) - - - - - DELETE FROM basic_udirel WHERE id = #{id} - - - DELETE FROM basic_udirel WHERE id in - - #{item} - - - - DELETE FROM basic_udirel WHERE uuid = #{uuid} - - - - UPDATE basic_udirel - - thirdId=#{thirdId}, - thirdName=#{thirdName}, - uuid=#{uuid}, - isUseDy=#{isUseDy}, - updateTime=#{updateTime}, - batchNo=#{batchNo}, - warehouseName=#{warehouseName}, - - WHERE id = #{id} - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/basic/UnitMaintainDao.xml b/api-admin/target/classes/mybatis/mapper/basic/UnitMaintainDao.xml deleted file mode 100644 index 36ab4d15..00000000 --- a/api-admin/target/classes/mybatis/mapper/basic/UnitMaintainDao.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - INSERT INTO basic_corp - (thirdId,erpId,name,spell, - addr,status,type,contact,mobile,creditNo) - values - ( - #{thirdId}, - #{erpId}, - #{name}, - #{spell}, - #{addr}, - #{status}, - #{type}, - #{contact}, - #{mobile}, - #{creditNo} - ) - - - - DELETE FROM basic_corp WHERE id = #{id} - - - - - diff --git a/api-admin/target/classes/mybatis/mapper/info/CompanyDao.xml b/api-admin/target/classes/mybatis/mapper/info/CompanyDao.xml deleted file mode 100644 index cb0ba302..00000000 --- a/api-admin/target/classes/mybatis/mapper/info/CompanyDao.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - UPDATE company SET - name = #{name}, - category = #{category}, - creditCode = #{creditCode}, - addr = #{addr}, - productAddr = #{productAddr}, - classes = #{classes}, - appId = #{appId}, - appSecret = #{appSecret} - - - - INSERT INTO company(name,category,creditCode,addr,productAddr,classes,appId,appSecret) values - ( #{name}, - #{category}, - #{creditCode}, - #{addr}, - #{productAddr}, - #{classes}, - #{appId}, - #{appSecret}) - - - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/info/ScheduleDao.xml b/api-admin/target/classes/mybatis/mapper/info/ScheduleDao.xml deleted file mode 100644 index 951ad044..00000000 --- a/api-admin/target/classes/mybatis/mapper/info/ScheduleDao.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - insert INTO scheduled - (cronName,cron,customerId) - values - ( - #{cronName}, - #{cron}, - #{customerId} - ) - - - - - delete from scheduled where id = #{id} - - - - - - - diff --git a/api-admin/target/classes/mybatis/mapper/info/SetupDao.xml b/api-admin/target/classes/mybatis/mapper/info/SetupDao.xml deleted file mode 100644 index 49fbdb3e..00000000 --- a/api-admin/target/classes/mybatis/mapper/info/SetupDao.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - UPDATE system_config - - erpSaleOutModify=#{erpSaleOutModify}, - erpGetSaleOut=#{erpGetSaleOut}, - erpSaleOutSign=#{erpSaleOutSign}, - filterSaleOutSign=#{filterSaleOutSign}, - erpGetSaleOutDay=#{erpGetSaleOutDay}, - - erpPruchaseModify=#{erpPruchaseModify}, - erpGetPurchaseIn=#{erpGetPurchaseIn}, - erpPruchaseSign=#{erpPruchaseSign}, - erpGetPurchaseDay=#{erpGetPurchaseDay}, - filterPurchaseSign=#{filterPurchaseSign}, - remark=#{remark}, - forbidSameErp=#{forbidSameErp}, - returnWareHouseOut=#{returnWareHouseOut}, - salesWareHouseOut=#{salesWareHouseOut}, - returnWareHouseIn=#{returnWareHouseIn}, - updateErpData=#{updateErpData}, - dlStockErp=#{dlStockErp}, - dlStockErpDay=#{dlStockErpDay}, - - WHERE id=#{id} - - - - - - insert INTO system_config(erpSaleOutModify, - erpGetSaleOut,erpSaleOutSign,filterSaleOutSign,erpGetSaleOutDay,erpPruchaseModify, - erpGetPurchaseIn,erpPruchaseSign, - erpGetPurchaseDay,filterPurchaseSign,remark,forbidSameErp, - returnWareHouseOut,salesWareHouseOut,returnWareHouseIn,updateErpData,dlStockErp,dlStockErpDay - ) values - ( - #{erpSaleOutModify},#{erpGetSaleOut}, #{erpSaleOutSign}, - #{filterSaleOutSign}, #{erpGetSaleOutDay},#{erpPruchaseModify}, #{erpGetPurchaseIn}, - #{erpPruchaseSign}, - #{erpGetPurchaseDay}, #{filterPurchaseSign}, - #{remark},#{forbidSameErp} - ,#{returnWareHouseOut},#{salesWareHouseOut},#{returnWareHouseIn},#{updateErpData},#{dlStockErp},#{dlStockErpDay}) - - - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/info/SystemParamConfigDao.xml b/api-admin/target/classes/mybatis/mapper/info/SystemParamConfigDao.xml deleted file mode 100644 index 0b8fd2c6..00000000 --- a/api-admin/target/classes/mybatis/mapper/info/SystemParamConfigDao.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - UPDATE system_param_config - - paramName=#{paramName}, - paramKey=#{paramKey}, - paramValue=#{paramValue}, - paramStatus=#{paramStatus}, - paramType=#{paramType}, - paramExplain=#{paramExplain}, - - WHERE id=#{id} - - - - UPDATE system_param_config - - paramStatus=#{paramStatus}, - - WHERE parentId=#{parentId} - - - - insert INTO system_param_config(paramName, - paramKey,paramValue,paramStatus,paramType,paramExplain - ) values - ( - #{paramName}, - #{paramKey}, - #{paramValue}, - #{paramStatus}, - #{paramType}, - #{paramExplain} - ) - - - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/inout/CodesDao.xml b/api-admin/target/classes/mybatis/mapper/inout/CodesDao.xml deleted file mode 100644 index b8d2405a..00000000 --- a/api-admin/target/classes/mybatis/mapper/inout/CodesDao.xml +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - INSERT INTO io_codes(action,mainAction,code,corpOrderId,actor,actDate,wrongCode,upperCorpOrderId,fromCorpId,fromCorp,type) - values( - #{action}, - #{mainAction}, - #{code}, - #{corpOrderId}, - #{actor}, - #{actDate}, - #{wrongCode}, - #{upperCorpOrderId}, - #{fromCorpId}, - #{fromCorp},#{orderId},#{type}) - - - - INSERT INTO io_codes - (action, - mainAction, - code, - corpOrderId, - actor, - actDate, - wrongCode, - upperCorpOrderId, - fromCorpId,fromCorp,orderId,batchNo,produceDate,expireDate,serialNo,udi,count,type) - VALUES - - ( - #{item.action}, - #{item.mainAction}, - #{item.code}, - #{item.corpOrderId}, - #{item.actor}, - #{item.actDate}, - #{item.wrongCode}, - #{item.upperCorpOrderId}, - #{item.fromCorpId}, - #{ - item.fromCorp - },#{item.orderId},#{item.batchNo} - ,#{item.produceDate} - ,#{item.expireDate} - ,#{item.serialNo} - ,#{item.udi} - ,#{item.count} - ,#{item.type}) - - - - - - - - - - - UPDATE io_codes SET orderId = #{newOrderId} where orderId = #{oldOrderId} - - - - - UPDATE io_codes SET fromCorpID = #{fromCorpID}, fromCorp = #{fromCorp} - WHERE orderId = #{orderId} - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/inout/CodesTempDao.xml b/api-admin/target/classes/mybatis/mapper/inout/CodesTempDao.xml deleted file mode 100644 index 9802f3d4..00000000 --- a/api-admin/target/classes/mybatis/mapper/inout/CodesTempDao.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - INSERT INTO io_codes_temp - (action, mainAction,code, corpOrderId, actor,actDate, - fromCorpID, fromCorp, orderId,batchNo,produceDate,expireDate,serialNo,udi,count) - VALUES - - ( - #{item.action}, - #{item.mainAction}, - #{item.code}, - #{item.corpOrderId}, - #{item.actor}, - #{item.actDate}, - #{item.fromCorpID}, - #{item.fromCorp}, - #{item.orderId} - ,#{item.batchNo} - ,#{item.produceDate} - ,#{item.expireDate} - ,#{item.serialNo} - ,#{item.udi} - ,#{item.count} - ) - - - - - - DELETE FROM io_codes_temp WHERE id IN - - #{item} - - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/inout/OrderDao.xml b/api-admin/target/classes/mybatis/mapper/inout/OrderDao.xml deleted file mode 100644 index 9affeb6c..00000000 --- a/api-admin/target/classes/mybatis/mapper/inout/OrderDao.xml +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - - - - - - - insert INTO io_order(id,action,corpOrderId,actDate,fromCorpId,actor,mainAction, - fromCorp,status,remark,exportStatus,fromType,contrastStatus,signStatus,erpFk,stockCheckFk) - values( - #{id}, - #{action}, - #{corpOrderId}, - #{actDate}, - #{fromCorpId}, - #{actor}, - #{mainAction}, - #{fromCorp}, - #{status}, - #{remark}, - #{exportStatus}, - #{fromType}, - #{contrastStatus}, - #{signStatus}, - #{erpFk}, - #{stockCheckFk}) - - - UPDATE io_order - - action=#{action}, - corpOrderId=#{corpOrderId}, - actDate=#{actDate}, - fromCorpId=#{fromCorpId}, - actor=#{actor}, - mainAction=#{mainAction}, - fromCorp=#{fromCorp}, - status=#{status}, - remark=#{remark}, - exportStatus=#{exportStatus}, - fromType=#{fromType}, - contrastStatus=#{contrastStatus}, - erpFk=#{erpFk}, - signStatus=#{signStatus} - stockCheckFk=#{stockCheckFk} - - WHERE id = #{id} - - - - - DELETE FROM io_order WHERE id = #{orderId} - - - - DELETE FROM io_order WHERE id = #{id} - - - - UPDATE io_order SET fromCorpId = #{fromCorpId},fromCorp = #{fromCorp} where id = #{id} - - - - UPDATE io_order SET `status` = #{status} where id = #{orderId} - - - UPDATE io_order SET `exportStatus` = #{exportStatus} where id = #{orderId} - - - UPDATE io_order SET `contrastStatus` = #{contrastStatus} where id = #{orderId} - - - UPDATE io_order SET `signStatus` = #{signStatus} where id = #{orderId} - - - UPDATE io_order SET `remark` = #{remark} where id = #{orderId} - - - - - - - - - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/inout/OrderDetail.xml b/api-admin/target/classes/mybatis/mapper/inout/OrderDetail.xml deleted file mode 100644 index 9d33e0b0..00000000 --- a/api-admin/target/classes/mybatis/mapper/inout/OrderDetail.xml +++ /dev/null @@ -1,183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - replace INTO io_order_detail(id, - companyid,erpOrderId,iodtlId,inoutId,goodsunit,goodsid, - batchNoId,goodsname,companyname, - batchNo,erpCount,credate,nameCode,productCompany, - coName,authCode,packSpec,packRatio,bhzxxsbzsl, - zxxsbzbhsydysl,orderIdFk,count,reCount) - values( - #{id}, - #{companyid}, - #{erpOrderId}, - #{iodtlId}, - #{inoutId}, - #{goodsunit}, - #{goodsid}, - #{batchNoId}, - #{goodsname}, - #{companyname}, - #{batchNo}, - #{erpCount}, - #{credate}, - #{nameCode},#{productCompany},#{coName},#{authCode},#{packSpec},#{packRatio}, - #{bhzxxsbzsl},#{zxxsbzbhsydysl},#{orderIdFk},#{count},#{reCount} - ) - - - - replace INTO io_order_detail(id, - companyid,erpOrderId,iodtlId,inoutId,goodsunit,goodsid,batchNoId,goodsname,companyname, - batchNo,erpCount,credate,nameCode,productCompany, - coName,authCode,packSpec,packRatio,bhzxxsbzsl,zxxsbzbhsydysl,orderIdFk,count,reCount) - values - - - ( - #{item.id}, - #{item.companyid}, - #{item.erpOrderId}, - #{item.iodtlId}, - #{item.inoutId}, - #{item.goodsunit}, - #{item.goodsid}, - #{item.batchNoId}, - #{item.goodsname}, - #{item.companyname}, - #{item.batchNo}, - #{item.erpCount}, #{item.credate}, - #{item.nameCode}, #{item.productCompany}, #{item.coName}, #{item.authCode}, #{item.packSpec}, - #{item.packRatio}, #{item.bhzxxsbzsl}, - #{item.zxxsbzbhsydysl}, #{item.orderIdFk}, #{item.count},#{item.reCount}) - - - - - UPDATE io_order_detail - - count=#{count}, - reCount=#{reCount}, - - WHERE id = #{id} - - - DELETE FROM io_order_detail WHERE docid = #{id} - - - - DELETE FROM io_order_detail WHERE id = #{id} - - - - DELETE FROM io_order_detail WHERE orderIdFk = #{id} - - - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/inventory/InvErpStockDao.xml b/api-admin/target/classes/mybatis/mapper/inventory/InvErpStockDao.xml deleted file mode 100644 index 0c07cb75..00000000 --- a/api-admin/target/classes/mybatis/mapper/inventory/InvErpStockDao.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - replace INTO erpstock - ( - orderId,code,batchNo,manufacturingDate,expirationDate,count,remark,name - ) - values - ( - #{orderId}, - #{code}, - #{batchNo}, - #{manufacturingDate}, - #{count}, - #{remark}, - #{name} - ) - - - - replace INTO erpstock - ( - orderId,code,batchNo,manufacturingDate,expirationDate,count,remark,name - ) - values - - - ( - #{item.orderId}, - #{item.code}, - #{item.batchNo}, - #{item.manufacturingDate}, - #{item.expirationDate}, - #{item.count}, - #{item.remark}, - #{item.name} - ) - - - - - DELETE FROM erpstock WHERE id = #{id} - - - - UPDATE erpstock - - orderId=#{orderId}, - code=#{code}, - batchNo=#{batchNo}, - manufacturingDate=#{manufacturingDate}, - expirationDate=#{expirationDate}, - count=#{count}, - remark=#{remark}, - name=#{name}, - - WHERE id = #{id} - - - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/inventory/InvOrderCheckDao.xml b/api-admin/target/classes/mybatis/mapper/inventory/InvOrderCheckDao.xml deleted file mode 100644 index fb6ad438..00000000 --- a/api-admin/target/classes/mybatis/mapper/inventory/InvOrderCheckDao.xml +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - - - insert INTO stockcheck - ( - action,actDate,status,remark,endTime,whouse,houseCard - ) - values - ( - #{action}, - #{actDate}, - #{status}, - #{remark},#{endTime},#{whouse},#{houseCard} - ) - - - - - DELETE FROM stockcheck WHERE id = #{id} - - - - UPDATE stockcheck - - action=#{action}, - actDate=#{actDate}, - status=#{status}, - remark=#{remark}, - endTime=#{endTime}, - whouse=#{whouse}, - houseCard=#{houseCard}, - - WHERE id = #{id} - - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mapper/inventory/InvStockPrintDao.xml b/api-admin/target/classes/mybatis/mapper/inventory/InvStockPrintDao.xml deleted file mode 100644 index baddf9a6..00000000 --- a/api-admin/target/classes/mybatis/mapper/inventory/InvStockPrintDao.xml +++ /dev/null @@ -1,142 +0,0 @@ - - - - - - - - - - - - replace INTO stockprint - ( - udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, - produceDate,expireDate,serialNo,codeType,thirdId,thirdName, - ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode - ) - values - ( - #{udiCode}, - #{udiRlIdFk}, - #{nameCode}, - #{cpmctymc}, - #{batchNo}, - #{produceDate}, - #{expireDate}, - #{serialNo}, - #{codeType}, - #{thirdId}, - #{thirdName}, - #{ggxh}, - #{ylqxzcrbarmc}, - #{zczbhhzbapzbh}, - #{warehouseName}, - #{warehouseCode} - ) - - - - replace INTO stockprint - ( - udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, - produceDate,expireDate,serialNo,codeType,thirdId,thirdName, - ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode - ) - values - - - ( - #{item.udiCode}, - #{item.udiRlIdFk}, - #{item.nameCode}, - #{item.cpmctymc}, - #{item.batchNo}, - #{item.produceDate}, - #{item.expireDate}, - #{item.serialNo}, - #{item.codeType}, - #{item.thirdId}, - #{item.thirdName}, - #{item.ggxh}, - #{item.ylqxzcrbarmc}, - #{item.zczbhhzbapzbh}, - #{item.warehouseName}, - #{item.warehouseCode} - ) - - - - - DELETE FROM stockprint WHERE id = #{id} - - - - UPDATE stockprint - - udiCode=#{udiCode}, - udiRlIdFk=#{udiRlIdFk}, - nameCode=#{nameCode}, - cpmctymc=#{cpmctymc}, - batchNo=#{batchNo}, - produceDate=#{produceDate}, - expireDate=#{expireDate}, - serialNo=#{serialNo}, - codeType=#{codeType}, - thirdId=#{thirdId}, - thirdName=#{thirdName}, - printStatus=#{printStatus}, - ggxh=#{ggxh}, - ylqxzcrbarmc=#{ylqxzcrbarmc}, - zczbhhzbapzbh=#{zczbhhzbapzbh}, - warehouseName=#{warehouseName}, - warehouseCode=#{warehouseCode}, - - - WHERE id = #{id} - - - - - update stockprint - set printStatus = 1 - WHERE id in - - #{item} - - - \ No newline at end of file diff --git a/api-admin/target/classes/mybatis/mybatis-config.xml b/api-admin/target/classes/mybatis/mybatis-config.xml deleted file mode 100644 index a72d9782..00000000 --- a/api-admin/target/classes/mybatis/mybatis-config.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/api-admin/target/classes/static/.gitignore b/api-admin/target/classes/static/.gitignore deleted file mode 100644 index c96a04f0..00000000 --- a/api-admin/target/classes/static/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/api-admin/target/classes/templates/.gitignore b/api-admin/target/classes/templates/.gitignore deleted file mode 100644 index c96a04f0..00000000 --- a/api-admin/target/classes/templates/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/api-admin/target/test-classes/META-INF/api-admin.kotlin_module b/api-admin/target/test-classes/META-INF/api-admin.kotlin_module deleted file mode 100644 index 8fb60192..00000000 Binary files a/api-admin/target/test-classes/META-INF/api-admin.kotlin_module and /dev/null differ diff --git a/api-admin/target/test-classes/com/glxp/api/BaseApiAdminApplicationTest.class b/api-admin/target/test-classes/com/glxp/api/BaseApiAdminApplicationTest.class deleted file mode 100644 index 47b22117..00000000 Binary files a/api-admin/target/test-classes/com/glxp/api/BaseApiAdminApplicationTest.class and /dev/null differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImplTest.class b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImplTest.class deleted file mode 100644 index 90d58254..00000000 Binary files a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthAdminServiceImplTest.class and /dev/null differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImplTest.class b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImplTest.class deleted file mode 100644 index 3f12e385..00000000 Binary files a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthLoginServiceImplTest.class and /dev/null differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.class b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.class deleted file mode 100644 index 1670bd9d..00000000 Binary files a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthPermissionRuleServiceImplTest.class and /dev/null differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImplTest.class b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImplTest.class deleted file mode 100644 index 43563b9d..00000000 Binary files a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthRoleAdminServiceImplTest.class and /dev/null differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImplTest.class b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImplTest.class deleted file mode 100644 index 7ebe7adb..00000000 Binary files a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/AuthRoleServiceImplTest.class and /dev/null differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/MmpaTest.class b/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/MmpaTest.class deleted file mode 100644 index 965bb0ce..00000000 Binary files a/api-admin/target/test-classes/com/glxp/api/admin/service/auth/impl/MmpaTest.class and /dev/null differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/util/DlDeviceTest.class b/api-admin/target/test-classes/com/glxp/api/admin/util/DlDeviceTest.class deleted file mode 100644 index ed755951..00000000 Binary files a/api-admin/target/test-classes/com/glxp/api/admin/util/DlDeviceTest.class and /dev/null differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/util/JwtUtilsTest.class b/api-admin/target/test-classes/com/glxp/api/admin/util/JwtUtilsTest.class deleted file mode 100644 index 206b4193..00000000 Binary files a/api-admin/target/test-classes/com/glxp/api/admin/util/JwtUtilsTest.class and /dev/null differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/util/NormalTest.class b/api-admin/target/test-classes/com/glxp/api/admin/util/NormalTest.class deleted file mode 100644 index 35000679..00000000 Binary files a/api-admin/target/test-classes/com/glxp/api/admin/util/NormalTest.class and /dev/null differ diff --git a/api-admin/target/test-classes/com/glxp/api/admin/util/PermissionRuleTreeUtilsTest.class b/api-admin/target/test-classes/com/glxp/api/admin/util/PermissionRuleTreeUtilsTest.class deleted file mode 100644 index 1897ca36..00000000 Binary files a/api-admin/target/test-classes/com/glxp/api/admin/util/PermissionRuleTreeUtilsTest.class and /dev/null differ