diff --git a/api-admin/pom.xml b/api-admin/pom.xml index 0abdfa14..b65c9279 100644 --- a/api-admin/pom.xml +++ b/api-admin/pom.xml @@ -79,11 +79,17 @@ runtime + + + + + + com.oracle - ojdbc6 - 11.2.0.4 - runtime + ojdbc14 + 10.2.0.4.0 + pom @@ -197,7 +203,11 @@ hutool-all 5.7.9 - + + com.belerweb + pinyin4j + 2.5.0 + com.google.zxing @@ -209,6 +219,81 @@ javase 3.3.3 + + org.olap4j + olap4j + 1.2.0 + + + + + + + + net.sf.barcode4j + barcode4j + 2.1 + + + org.olap4je + olap4j + + + + + + net.sf.jasperreports + jasperreports + 6.5.1 + + + com.lowagie + itext + + + + + + net.sf.jasperreports + jasperreports-fonts + 6.0.0 + + + + + com.itextpdf + itext-pdfa + 5.5.0 + + + + cn.lesper + iTextAsian + 3.0 + + + + + + org.apache.xmlgraphics + batik-bridge + 1.11 + + + + org.apache.xmlgraphics + batik-dom + 1.11 + + + + org.eclipse.birt.runtime.3_7_1 + com.lowagie.text + 2.1.7 + + + + 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 1e338cf1..5a784999 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 @@ -38,4 +38,22 @@ public class ConstantStatus { public static final Integer DI_TYPE_BTBS = 3;//本体标识 public static final Integer DI_TYPE_BZBS = 4;//包装标识 + + + //业务单据状态 + public static String SORDER_DRAFT = "1";//草稿 + public static String SORDER_ALLOC = "2";//未配货 + public static String SORDER_CHECK = "3";//待校验 + public static String SORDER_CHECKED = "4";//已校验 + public static String SORDER_DELIVER = "5";//已送货 + + public static String SORDER_PRINT_UN = "101";//101：未打印，102：已打印 + public static String SORDER_PRINT_ED = "102";// + + //业务单据来源 + public static String ST_WEB_ADD = "1"; //前端新增 + public static String ST_THIRD_SEL = "2"; //第三方选入 + public static String ST_SCAN_ADD = "3"; //扫码单据转换 + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthCheckController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthCheckController.java new file mode 100644 index 00000000..e83e676c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/auth/AuthCheckController.java @@ -0,0 +1,76 @@ +package com.glxp.api.admin.controller.auth; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.auth.AuthAdmin; +import com.glxp.api.admin.entity.auth.AuthCheckEntity; +import com.glxp.api.admin.req.auth.AuthAdminQueryRequest; +import com.glxp.api.admin.req.auth.AuthAdminSaveRequest; +import com.glxp.api.admin.req.auth.AuthCheckRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.auth.AuthAdminResponse; +import com.glxp.api.admin.service.auth.AuthAdminService; +import com.glxp.api.admin.service.auth.AuthCheckService; +import com.glxp.api.admin.util.RsaUtils; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.validation.Valid; +import java.util.List; + +@RestController +public class AuthCheckController { + + @Resource + private AuthCheckService authCheckService; + + @GetMapping("/udiwms/auth/device/filter") + public BaseResponse index(AuthCheckRequest authCheckRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List authCheckEntityList = authCheckService.filterDevices(authCheckRequest); + + PageInfo authCheckEntityPageInfo = new PageInfo<>(authCheckEntityList); + PageSimpleResponse authAdminResponseList = new PageSimpleResponse<>(); + authAdminResponseList.setTotal(authCheckEntityPageInfo.getTotal()); + authAdminResponseList.setList(authCheckEntityList); + + return ResultVOUtils.success(authAdminResponseList); + + } + + @PostMapping("/udiwms/auth/device/save") + public BaseResponse save(@RequestBody @Valid AuthCheckEntity authCheckEntity, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + + String key = null; + try { + key = RsaUtils.publicKeyDecrypt(authCheckEntity.getRegisterCode(), RsaUtils.publicKey); + if (key != null && key.equals(authCheckEntity.getMachineInfo())) { + authCheckService.updateDevices(authCheckEntity); + return ResultVOUtils.success("注册成功！"); + } else { + return ResultVOUtils.error(500, "注册失败，注册码不匹配！"); + } + } catch (Exception e) { + e.printStackTrace(); + } + return ResultVOUtils.error(500, "注册失败！"); + + } + + +} 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 e60682af..64c76963 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 @@ -1,8 +1,11 @@ package com.glxp.api.admin.controller.auth; +import com.glxp.api.admin.entity.auth.AuthCheckEntity; import com.glxp.api.admin.req.auth.LoginRequest; +import com.glxp.api.admin.req.auth.PCLoginRequest; import com.glxp.api.admin.req.auth.UpdatePasswordRequest; -import com.glxp.api.admin.util.DateUtil; +import com.glxp.api.admin.service.auth.AuthCheckService; +import com.glxp.api.admin.util.*; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; @@ -11,10 +14,7 @@ import com.glxp.api.admin.entity.auth.AuthAdmin; import com.glxp.api.admin.exception.JsonException; import com.glxp.api.admin.service.auth.AuthAdminService; import com.glxp.api.admin.service.auth.AuthLoginService; -import com.glxp.api.admin.util.PasswordUtils; import com.glxp.api.admin.res.auth.LoginUserInfoResponse; -import com.glxp.api.admin.util.IpUtils; -import com.glxp.api.admin.util.JwtUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.util.*; @@ -41,8 +42,12 @@ public class LoginController { @Autowired private AuthAdminService authAdminService; + @Resource + private AuthCheckService authCheckService; + /** * 用户登录 + * * @return */ @PostMapping(value = "/login") @@ -61,7 +66,7 @@ public class LoginController { if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(authAdmin.getPassWord())) { throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); } - + // 更新登录状态 AuthAdmin authAdminUp = new AuthAdmin(); authAdminUp.setId(authAdmin.getId()); @@ -84,8 +89,75 @@ public class LoginController { return ResultVOUtils.success(map); } + /** + * 用户登录 + * + * @return + */ + @PostMapping(value = "/pc/login") + public BaseResponse pcLogin(@RequestBody @Valid PCLoginRequest loginRequest, + BindingResult bindingResult, + HttpServletRequest request) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + AuthCheckEntity authCheckEntity = authCheckService.findByMachine(loginRequest.getMachineInfo()); + if (authCheckEntity == null) { + authCheckEntity = new AuthCheckEntity(); + authCheckEntity.setMachineInfo(loginRequest.getMachineInfo().trim()); + authCheckEntity.setCreateDate(new Date()); + authCheckService.insertDevices(authCheckEntity); + throw new JsonException(ResultEnum.DATA_NOT, "该软件未注册！请联系管理员"); + } else { + if (authCheckEntity.getRegisterCode() == null) { + throw new JsonException(ResultEnum.DATA_NOT, "该软件未注册！请联系管理员"); + } else { + try { + String data = RsaUtils.publicKeyDecrypt(authCheckEntity.getRegisterCode(), RsaUtils.publicKey); + if (!data.equals(authCheckEntity.getMachineInfo())) { + throw new JsonException(ResultEnum.DATA_NOT, "注册码不匹配，请联系管理员!"); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + } + + AuthAdmin authAdmin = authAdminService.findByUserName(loginRequest.getUsername()); + if (authAdmin == null) { + throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); + } + + if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(authAdmin.getPassWord())) { + throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误"); + } + + // 更新登录状态 + AuthAdmin authAdminUp = new AuthAdmin(); + authAdminUp.setId(authAdmin.getId()); + authAdminUp.setLastLoginTime(new Date()); + authAdminUp.setLastLoginIp(IpUtils.getIpAddr(request)); + authAdminService.updateAuthAdmin(authAdminUp); + + // 登录成功后获取权限，这里面会设置到缓存 + authLoginService.listRuleByAdminId(authAdmin.getId()); + + Map claims = new HashMap<>(); + claims.put("admin_id", authAdmin.getId()); + String token = JwtUtils.createToken(claims, 86400L); // 一天后过期 + + Map map = new HashMap<>(); + map.put("id", authAdmin.getId()); + map.put("token", token); + map.put("time", DateUtil.getDateTime()); + + return ResultVOUtils.success(map); + } + + /** * 获取登录用户信息 + * * @return */ @AuthRuleAnnotation("") @@ -107,15 +179,17 @@ public class LoginController { /** * 登出 + * * @return */ @PostMapping("/admin/auth/login/out") - public BaseResponse out(){ + public BaseResponse out() { return ResultVOUtils.success(); } /** * 修改密码 + * * @return */ @AuthRuleAnnotation("") // 需要登录验证,但是不需要权限验证时,value 值填空字符串 diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java index 38bba607..91a48e8f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BasicUnitMaintainController.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.controller.basic; +import cn.hutool.extra.pinyin.PinyinUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.annotation.AuthRuleAnnotation; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; @@ -197,7 +198,13 @@ public class BasicUnitMaintainController { } basicUnitMaintainEntity.setErpId(CustomUtil.getId()); basicUnitMaintainEntity.setName(erpUnitsResponse.getName()); - basicUnitMaintainEntity.setSpell(erpUnitsResponse.getSpell()); + if(erpUnitsResponse.getSpell()==null || "".equals(erpUnitsResponse.getSpell())){ + basicUnitMaintainEntity.setSpell(PinyinUtil.getFirstLetter(erpUnitsResponse.getName(),"").toUpperCase(Locale.ROOT)); + }else{ + basicUnitMaintainEntity.setSpell(erpUnitsResponse.getSpell()); + } + basicUnitMaintainEntity.setAddr(erpUnitsResponse.getAddr()); + basicUnitMaintainEntity.setAddr(erpUnitsResponse.getAddr()); basicUnitMaintainEntity.setCreditNo(erpUnitsResponse.getCreditNo()); basicUnitMaintainEntity.setContact(erpUnitsResponse.getContact()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java index a4cd6c32..119b9d8f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessLocalTypeController.java @@ -25,6 +25,23 @@ public class BussinessLocalTypeController { @Resource private BussinessLocalTypeService bussinessTypeService; + @GetMapping("/udiwms/localBusType/filterJoin") + public BaseResponse filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List bussinessTypeEntities; + bussinessTypeEntities = bussinessTypeService.filterJoin( + bussinessTypeFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(bussinessTypeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(bussinessTypeEntities); + return ResultVOUtils.success(pageSimpleResponse); + } @GetMapping("/udiwms/localBusType/filter") public BaseResponse filterBussinessType(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest, diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java new file mode 100644 index 00000000..67c3a9ab --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/basic/BussinessOriginTypeController.java @@ -0,0 +1,44 @@ +package com.glxp.api.admin.controller.basic; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity; +import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.basic.BussinessOriginTypeService; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +public class BussinessOriginTypeController { + + + @Resource + private BussinessOriginTypeService bussinessOriginTypeService; + + + @GetMapping("/udiwms/originBusType/filter") + public BaseResponse filterJoin(BussinessOriginTypeFilterRequest bussinessTypeFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List bussinessTypeEntities; + bussinessTypeEntities = bussinessOriginTypeService.filterList( + bussinessTypeFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(bussinessTypeEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(bussinessTypeEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + +} 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 b8bcf1f9..0ddf5fb5 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 @@ -171,7 +171,10 @@ public class CorpImportLogController { } for (int k = sheet.getFirstRowNum()+1; k <= sheet.getLastRowNum(); k++) { row = sheet.getRow(k); - if (row.getRowNum() <= 0) { + if (row == null || row.getRowNum() <= 0) { + continue; + } + if (filterEmpty(row)) { continue; } CorpImportDetailEntity corpImportDetailEntity = new CorpImportDetailEntity(); @@ -329,6 +332,46 @@ public class CorpImportLogController { return ResultVOUtils.success("上传成功"); } + public boolean filterEmpty(Row row) { + + if (row.getCell(0) != null) { + row.getCell(0).setCellType(CellType.STRING); + } + if (row.getCell(1) != null) { + row.getCell(1).setCellType(CellType.STRING); + } + if (row.getCell(2) != null) { + row.getCell(2).setCellType(CellType.STRING); + } + if (row.getCell(3) != null) { + row.getCell(3).setCellType(CellType.STRING); + } + if (row.getCell(4) != null) { + row.getCell(4).setCellType(CellType.STRING); + } + if (row.getCell(5) != null) { + row.getCell(5).setCellType(CellType.STRING); + } + if (row.getCell(6) != null) { + row.getCell(6).setCellType(CellType.STRING); + } + 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(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())) + )) { + return true; + } + return false; + } //往来单位信息接口上传 @PostMapping("/udiwms/basic/corps/upload") 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 21dd68f4..5014e705 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 @@ -184,8 +184,6 @@ public class UdiInfoController { FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest(); BeanUtils.copyProperties(filterErpGoodsRequest, filterThrProductsRequest); filterThrProductsRequest.setThirdSysFk(filterErpGoodsRequest.getThirdSys()); - filterThrProductsRequest.setCode(null); - List thrCorpEntities = thrProductsService.filterThrProductsRequest(filterThrProductsRequest); for (ThrProductsEntity thrProductsEntity : 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 76aadc08..6ccab466 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 @@ -116,10 +116,11 @@ public class UdiInfoExportLogController { @PostMapping("/udiwms/products/importLog/export") public BaseResponse excelDownload(@RequestBody UdiInfoExportRequest udiInfoExportRequest) { - String fileName = "D:\\udiwms\\exportFile\\" + "产品信息导出" + System.currentTimeMillis() + ".xls"; + UdiInfoExportLogEntity udiInfoExportLogEntity = new UdiInfoExportLogEntity(); udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); String genKey = CustomUtil.getId(); + String fileName = "D:\\udiwms\\exportFile\\" + "医疗器械信息导出" + genKey + ".xls"; udiInfoExportLogEntity.setGenKey(genKey); udiInfoExportLogEntity.setFilePath(fileName); udiInfoExportLogEntity.setUpdateTime(new Date()); 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 38d6b4b0..d1bcd185 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 @@ -1,5 +1,6 @@ package com.glxp.api.admin.controller.basic; +import cn.hutool.extra.pinyin.PinyinUtil; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.constant.BasicProcessStatus; import com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity; @@ -18,6 +19,8 @@ import com.glxp.api.common.util.ResultVOUtils; import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.ss.usermodel.*; import org.apache.poi.xssf.usermodel.XSSFWorkbook; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -43,7 +46,8 @@ public class UdiInfoImportLogController { UdiInfoImportDetailService udiInfoImportService; @Resource BasicUdiInfoImportService basicUdiInfoImportService; - + private static final String TAG = "UdiInfoImportLogControl"; + private static final Logger log = LoggerFactory.getLogger(UdiInfoImportLogController.class); @GetMapping("/udiwms/products/importLog/filter") public BaseResponse filter(FilterUdiIpLogRequest filterUdiIpLogRequest, BindingResult bindingResult) { @@ -155,7 +159,7 @@ public class UdiInfoImportLogController { // 滤过第一行标题 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) || (!"udiCode".equals(row.getCell(0).getStringCellValue()) || !"医保编码".equals(row.getCell(1).getStringCellValue()) || !"商品条码".equals(row.getCell(2).getStringCellValue()) @@ -165,20 +169,12 @@ public class UdiInfoImportLogController { || !"thirdId3".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) { + if (row == null || 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()))) { + if (filterEmpty(row)) { continue; } UdiInfoImportDetailEntity udiInfoImportEntity = new UdiInfoImportDetailEntity(); @@ -228,6 +224,12 @@ public class UdiInfoImportLogController { cell8.setCellType(CellType.STRING); udiInfoImportEntity.setThirdId4(cell8.getStringCellValue()); } + Cell cell9 = row.getCell(8); + if (cell9 != null) { + cell9.setCellType(CellType.STRING); + udiInfoImportEntity.setIsUseDy(cell9.getStringCellValue()); + } + udiInfoImportEntity.setGenKeyFk(genKey); udiInfoImportEntity.setStatus(0); udiInfoImportEntity.setUpdateTime(new Date(System.currentTimeMillis())); @@ -246,6 +248,47 @@ public class UdiInfoImportLogController { return ResultVOUtils.success("上传成功"); } + public boolean filterEmpty(Row row) { + + if (row.getCell(0) != null) { + row.getCell(0).setCellType(CellType.STRING); + } + if (row.getCell(1) != null) { + row.getCell(1).setCellType(CellType.STRING); + } + if (row.getCell(2) != null) { + row.getCell(2).setCellType(CellType.STRING); + } + if (row.getCell(3) != null) { + row.getCell(3).setCellType(CellType.STRING); + } + if (row.getCell(4) != null) { + row.getCell(4).setCellType(CellType.STRING); + } + if (row.getCell(5) != null) { + row.getCell(5).setCellType(CellType.STRING); + } + if (row.getCell(6) != null) { + row.getCell(6).setCellType(CellType.STRING); + } + 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(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())) + )) { + return true; + } + return false; + } + //产品信息接口上传 @PostMapping("/udiwms/basic/products/upload") @@ -260,22 +303,22 @@ public class UdiInfoImportLogController { } UdiInfoImportLogEntity udiInfoImportLogEntity = udiInfoImportLogService.selectByGenKey(genKey); List udiInfoImportEntities = postUdiInfoRequest.getDatas(); - if(udiInfoImportEntities!=null){ - for(UdiInfoImportDetailEntity udiInfoImportEntity:udiInfoImportEntities){ + if (udiInfoImportEntities != null) { + for (UdiInfoImportDetailEntity udiInfoImportEntity : udiInfoImportEntities) { udiInfoImportEntity.setGenKeyFk(genKey); udiInfoImportEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_UNPROCESS); udiInfoImportEntity.setUpdateTime(new java.util.Date()); udiInfoImportService.insertUdiInfoImport(udiInfoImportEntity); } } - if(udiInfoImportLogEntity==null){ + if (udiInfoImportLogEntity == null) { udiInfoImportLogEntity = new UdiInfoImportLogEntity(); udiInfoImportLogEntity.setGenKey(genKey); udiInfoImportLogEntity.setFromType("接口上传"); udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS); udiInfoImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); udiInfoImportLogService.insertImportLog(udiInfoImportLogEntity); - }else { + } else { udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS); udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity); } @@ -297,22 +340,22 @@ public class UdiInfoImportLogController { } UdiInfoImportLogEntity udiInfoImportLogEntity = udiInfoImportLogService.selectByGenKey(genKey); List udiInfoImportEntities = postUdiInfoRequest.getDatas(); - if(udiInfoImportEntities!=null){ - for(UdiInfoImportDetailEntity udiInfoImportEntity:udiInfoImportEntities){ + if (udiInfoImportEntities != null) { + for (UdiInfoImportDetailEntity udiInfoImportEntity : udiInfoImportEntities) { udiInfoImportEntity.setGenKeyFk(genKey); udiInfoImportEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_UNPROCESS); udiInfoImportEntity.setUpdateTime(new java.util.Date()); udiInfoImportService.insertUdiInfoImport(udiInfoImportEntity); } } - if(udiInfoImportLogEntity==null){ + if (udiInfoImportLogEntity == null) { udiInfoImportLogEntity = new UdiInfoImportLogEntity(); udiInfoImportLogEntity.setGenKey(genKey); udiInfoImportLogEntity.setFromType("扫码精灵上传"); udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS); udiInfoImportLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); udiInfoImportLogService.insertImportLog(udiInfoImportLogEntity); - }else { + } else { udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS); udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity); } @@ -323,7 +366,7 @@ public class UdiInfoImportLogController { //供应商平台产品信息下载 @GetMapping("/udiwms/products/smp/download") public BaseResponse downloadSmpUdi(FilterUdiIpLogRequest filterUdiIpLogRequest, - BindingResult bindingResult) { + BindingResult bindingResult) { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); @@ -335,7 +378,7 @@ public class UdiInfoImportLogController { udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_UNPROCESS); udiInfoImportLogEntity.setUpdateTime(new java.util.Date()); udiInfoImportLogService.insertImportLog(udiInfoImportLogEntity); - basicUdiInfoImportService.downloadSmpUdiInfo(genKey); + basicUdiInfoImportService.downloadSmpUdiInfo(genKey,filterUdiIpLogRequest.getLastUpdateTime()); return ResultVOUtils.success("后台已开始下载并更新，请稍后刷新查看!"); } 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 6e505dad..30abcacf 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 @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; import com.github.pagehelper.PageInfo; import com.glxp.api.admin.config.WebSocketServer; +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.inout.WarehouseEntity; @@ -274,6 +275,7 @@ public class UdiRelevanceController { udiInfoService.deleteById(udiInfoEntities.get(0).getId() + ""); } } + //选入查询结果的所有DI @GetMapping("/udi/udirel/combineAll") public BaseResponse combineAll(FilterUdiInfoRequest productInfoFilterRequest) { @@ -294,6 +296,30 @@ public class UdiRelevanceController { return ResultVOUtils.success("更新成功"); } + //解除绑定DI器械信息 + @GetMapping("/udiwms/udirl/di/remove") + public BaseResponse removeDI(RemoveRelRequest removeRelRequest) { + UdiRelevanceEntity udiRelevanceEntity = udiRelevanceService.selectById(removeRelRequest.getRelId()); + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), basicThirdSysEntity.getThirdId()); + 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(1); + udiInfoService.insertUdiInfo(udiInfoEntity); + udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); + udiRelevanceEntity.setUpdateTime(DateUtil.getDateTime()); + udiRelevanceService.updateUdiRelevance(udiRelevanceEntity); + return ResultVOUtils.success("解除绑定成功！"); + } + //单独选入ERP产品 @PostMapping("/udi/udirel/addErp") public BaseResponse addErp(@RequestBody CombineRequest combineRequest) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java new file mode 100644 index 00000000..58f03a1f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java @@ -0,0 +1,454 @@ +package com.glxp.api.admin.controller.business; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.constant.ConstantStatus; +import com.glxp.api.admin.controller.inventory.InvPrintController; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.business.StockOrderEntity; +import com.glxp.api.admin.entity.business.StockQRCodeTextEntity; +import com.glxp.api.admin.entity.info.CompanyEntity; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.entity.inventory.StockPrintEntity; +import com.glxp.api.admin.entity.inventory.StockPrinttREntity; +import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.admin.req.business.StockOrderFilterRequest; +import com.glxp.api.admin.req.business.StockOrderIdsRequest; +import com.glxp.api.admin.req.business.StockOrderPostRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.inventory.PostStockPrintRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.res.inout.ErpOrderResponse; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.business.StockOrderDetailService; +import com.glxp.api.admin.service.business.StockOrderDetailTempService; +import com.glxp.api.admin.service.business.StockOrderService; +import com.glxp.api.admin.service.business.StockQRCodeTextService; +import com.glxp.api.admin.service.info.CompanyService; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.service.inout.CodesService; +import com.glxp.api.admin.service.inventory.InCodeLogService; +import com.glxp.api.admin.service.inventory.InvStockPrintService; +import com.glxp.api.admin.util.DateUtil; +import com.glxp.api.admin.util.StockOrderBillNoUtils; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@RestController +public class StockOrderController { + + @Resource + private StockOrderService stockOrderService; + @Resource + private CodesService codesService; + @Resource + private StockOrderDetailService stockOrderDetailService; + @Resource + private StockOrderDetailTempService stockOrderDetailTempService; + @Resource + private StockQRCodeTextService stockQRCodeTextService; + @Resource + private UdiInfoService udiInfoService; + @Resource + private UdiRelevanceService udiRelevanceService; + @Resource + private SystemParamConfigService systemParamConfigService; + + @Resource + private InvPrintController invPrintController; + @Resource + InvStockPrintService stockPrintService; + @Resource + InCodeLogService inCodeLogService; + @Resource + CompanyService companyService; + + @GetMapping("/udiwms/stock/order/error") + public BaseResponse listStockOrderNoDealWith(StockOrderFilterRequest stockOrderFilterRequest) { + List stockOrderEntityList = stockOrderService.filterListOr(stockOrderFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(stockOrderEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(stockOrderEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/stock/order/postDealWith") + public BaseResponse postDealWith(@RequestBody StockOrderPostRequest stockOrderPostRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + StockOrderEntity stockOrderEntity = new StockOrderEntity(); + BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity); + stockOrderEntity.setStatus(ConstantStatus.SORDER_DRAFT);//未处理 + stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印 + stockOrderEntity.setSourceType(ConstantStatus.ST_THIRD_SEL);//外部提交 +// stockOrderEntity.setId(String.valueOf(new Date().getTime())); + stockOrderEntity.setBilldate(DateUtil.formatDate(new Date())); + boolean b = stockOrderService.insertStockOrder(stockOrderEntity); + if (b) { + List stockOrderDetailEntityList = stockOrderPostRequest.getSubErpOrders(); + for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) { + stockOrderDetailEntity.setOrderIdFk(stockOrderEntity.getId()); + stockOrderDetailEntity.setSweepCount(0 + ""); + } + stockOrderDetailTempService.insertStockOrderDetailTemps(stockOrderDetailEntityList); + } + + return ResultVOUtils.success("成功"); + } + + @PostMapping("/udiwms/stock/order/insertWeb") + public BaseResponse insertWeb(@RequestBody StockOrderPostRequest stockOrderPostRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + + boolean noRepeatBillNo = false; + boolean newBillNo = false; + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); + while (!noRepeatBillNo) { + if (newBillNo) { + String billNo = StockOrderBillNoUtils.getBillNo(stockOrderPostRequest.getBillType()); + stockOrderPostRequest.setBillNo(billNo); + } + if (StringUtils.isBlank(stockOrderPostRequest.getBillNo())) { + newBillNo = true; + continue; + } + stockOrderFilterRequest.setBillNo(stockOrderPostRequest.getBillNo()); + if (stockOrderService.findOne(stockOrderFilterRequest) == null) { + noRepeatBillNo = true; + newBillNo = false; + } else { + newBillNo = true; + } + } + + StockOrderEntity stockOrderEntity = new StockOrderEntity(); + BeanUtils.copyProperties(stockOrderPostRequest, stockOrderEntity); + + stockOrderEntity.setStatus( + StringUtils.isBlank(stockOrderEntity.getStatus()) ? 501 + ""//未提交 + : stockOrderEntity.getStatus()); + stockOrderEntity.setPrintStatus(ConstantStatus.SORDER_PRINT_UN);//未打印 + stockOrderEntity.setSourceType(ConstantStatus.ST_WEB_ADD);//本地网页新增 + boolean b = false; + if (stockOrderEntity.getStatus().equals("502")) {//已提交 + SystemParamConfigEntity systemParamConfigEntity = + systemParamConfigService.selectByParamKey("stock_order_new_submit_type"); + if (systemParamConfigEntity == null || systemParamConfigEntity.getParamValue().equals("0")) { + stockOrderEntity.setStatus("201");//未配货 + } else { + stockOrderEntity.setStatus("202");//已配货 + } + } + if (StringUtils.isBlank(stockOrderEntity.getId())) { + + CompanyEntity companyEntity = companyService.findCompany(); +// stockOrderEntity.setCorpId(companyEntity.getUnitIdFk()); +// stockOrderEntity.setCorpName(companyEntity.getCompanyName()); +// stockOrderEntity.setUnitIdFk(companyEntity.getUnitIdFk()); + stockOrderEntity.setCustomerId(stockOrderPostRequest.getCustomerId()); + stockOrderEntity.setBilldate(DateUtil.formatDate(new Date())); + b = stockOrderService.insertStockOrder(stockOrderEntity); + } else { + stockOrderService.updateById(stockOrderEntity); + } + if (stockOrderPostRequest.getSubErpOrders() != null) { + List stockOrderDetailEntityList = stockOrderPostRequest.getSubErpOrders(); + for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) { + stockOrderDetailEntity.setOrderIdFk( + StringUtils.isBlank(stockOrderDetailEntity.getOrderIdFk()) ? + stockOrderEntity.getId() : stockOrderDetailEntity.getOrderIdFk()); + + if (StringUtils.isBlank(stockOrderDetailEntity.getId())) { + stockOrderDetailEntity.setReCount( + StringUtils.isBlank(stockOrderDetailEntity.getReCount()) ? "0" : stockOrderDetailEntity.getReCount()); + stockOrderDetailEntity.setCount( + StringUtils.isBlank(stockOrderDetailEntity.getCount()) ? "0" : stockOrderDetailEntity.getCount()); + stockOrderDetailEntity.setSweepCount( + StringUtils.isBlank(stockOrderDetailEntity.getSweepCount()) ? "0" : stockOrderDetailEntity.getSweepCount()); + + stockOrderDetailService.insertStockOrderDetail(stockOrderDetailEntity); + } else { + stockOrderDetailService.updateById(stockOrderDetailEntity); + } + } +// stockOrderDetailService.insertStockOrderDetails(stockOrderDetailEntityList); + } + + return ResultVOUtils.success("成功"); + } + + @PostMapping("/udiwms/stock/order/delete") + public BaseResponse deleteOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + + stockOrderService.deleteById(id); + stockOrderDetailService.deleteByOrderIdFk(id); + stockOrderDetailTempService.deleteByOrderIdFk(id); + return ResultVOUtils.success("删除成功"); + } + + @PostMapping("/udiwms/stock/order/error/delete") + public BaseResponse deleteErrorOrder(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + String id = deleteRequest.getId(); + + stockOrderService.deleteById(id); + stockOrderDetailTempService.deleteByOrderIdFk(id); + return ResultVOUtils.success("删除成功"); + } + + @GetMapping("/udiwms/stock/order/filter") + public BaseResponse filterOrder(StockOrderFilterRequest stockOrderFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List stockOrderEntityList; +// if (stockOrderFilterRequest.getStatus() == null) { +// stockOrderFilterRequest.setStatus(0 + ""); +// } + +// if (StringUtils.isNotBlank(stockOrderFilterRequest.getCorpId())) { +// CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCorpId())); +// stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk()); +// stockOrderFilterRequest.setCorpId(null); +// } + + stockOrderEntityList = stockOrderService.filterListOr(stockOrderFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(stockOrderEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(stockOrderEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @GetMapping("/udiwms/stock/order/filterDetail") + public BaseResponse filterDetail(StockOrderFilterRequest stockOrderFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (stockOrderFilterRequest.getBillType() == null) { + stockOrderFilterRequest.setBillType(stockOrderFilterRequest.getBillAction()); + } + List erpOrderResponses = new ArrayList<>(); +// if (stockOrderFilterRequest.getCustomerId() != null) { +// CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(stockOrderFilterRequest.getCustomerId())); +// stockOrderFilterRequest.setUnitIdFk(companyEntity.getUnitIdFk()); +// } + + List stockOrderEntityList; + stockOrderEntityList = stockOrderService.filterListOr(stockOrderFilterRequest); + if (stockOrderEntityList != null && stockOrderEntityList.size() > 0) { + + + for (StockOrderEntity stockOrderEntity : stockOrderEntityList) { + ErpOrderResponse erpOrderResponse = new ErpOrderResponse(); + BeanUtils.copyProperties(stockOrderEntity, erpOrderResponse); + + StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest(); + stockOrderDetailFilterRequest.setOrderIdFk(stockOrderEntity.getId()); + List stockOrderDetailEntityList + = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest); + + List subErpOrders = new ArrayList<>(); + if (stockOrderDetailEntityList != null && stockOrderDetailEntityList.size() > 0) { + for (StockOrderDetailEntity thrOrderDetailEntity : stockOrderDetailEntityList) { + ErpOrderResponse.SubErpOrder subErpOrder = new ErpOrderResponse.SubErpOrder(); + BeanUtils.copyProperties(thrOrderDetailEntity, subErpOrder); + subErpOrders.add(subErpOrder); + } + } + erpOrderResponse.setSubErpOrders(subErpOrders); + erpOrderResponses.add(erpOrderResponse); + } + } + PageInfo pageInfo; + pageInfo = new PageInfo<>(stockOrderEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(erpOrderResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @GetMapping("/udiwms/stock/order/submit") + public BaseResponse submitStockOrder(@RequestParam("id") String id) { + StockOrderEntity stockOrderEntity = new StockOrderEntity(); + stockOrderEntity.setId(id); + stockOrderEntity.setStatus(202 + "");//已配货 + stockOrderService.updateById(stockOrderEntity); + return ResultVOUtils.success(); + } + + @GetMapping("/udiwms/stock/order/new/submit") + public BaseResponse submitNewStockOrder(@RequestParam("id") String id) { + StockOrderEntity stockOrderEntity = new StockOrderEntity(); + stockOrderEntity.setId(id); + stockOrderEntity.setStatus(502 + "");//已提交 + stockOrderService.updateById(stockOrderEntity); + return ResultVOUtils.success(); + } + + @GetMapping("/udiwms/stock/order/new/repealSubmit") + public BaseResponse repealSubmitNewStockOrder(@RequestParam("id") String id) { + StockOrderEntity stockOrderEntity = new StockOrderEntity(); + stockOrderEntity.setId(id); + stockOrderEntity.setStatus(501 + "");//未提交 + stockOrderService.updateById(stockOrderEntity); + return ResultVOUtils.success(); + } + + @GetMapping("/udiwms/stock/order/error/submit") + public BaseResponse submitStockOrderError(@RequestParam("id") String id) { + StockOrderEntity stockOrderEntity = new StockOrderEntity(); + stockOrderEntity.setId(id); + stockOrderEntity.setStatus(101 + "");//重新提交为未处理 + stockOrderService.updateById(stockOrderEntity); + return ResultVOUtils.success(); + } + + @PostMapping("/udiwms/stock/order/qrcode/generate/text") + public BaseResponse generateStockOrderQRCodeText(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) { + + if (stockOrderIdsRequest.getIds().size() < 1) return ResultVOUtils.error(ResultEnum.DATA_ERROR); + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); + for (String id : stockOrderIdsRequest.getIds()) { + stockOrderFilterRequest.setId(id); + StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest); + stockPrintService.deleteByOrderId(stockOrderEntity.getId()); + if (stockOrderEntity == null) continue; + StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest(); + stockOrderDetailFilterRequest.setLimit(100); + stockOrderDetailFilterRequest.setPage(1); + stockOrderDetailFilterRequest.setOrderIdFk(id); + List stockOrderDetailEntityList = + stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest); + + List stockPrintEntities = new ArrayList<>(); + for (StockOrderDetailEntity stockOrderDetailEntity : stockOrderDetailEntityList) { + if (stockOrderIdsRequest.isFilterUDIType()) { +// UdiInfoEntity udiInfoEntity = +// udiInfoService.findByNameCode(stockOrderDetailEntity.getProductId()); + UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectGroupById(stockOrderDetailEntity.getProductId()); + if (udiRelevanceResponse != null && udiRelevanceResponse.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) {//TODO udi过滤检测 + StockPrintEntity stockPrintEntity = new StockPrintEntity(); + stockPrintEntity.setSOrderId(stockOrderEntity.getId()); + stockPrintEntity.setUpdateTime(new Date()); + stockPrintEntity.setNameCode(stockOrderDetailEntity.getProductId()); + stockPrintEntity.setProduceDate(stockOrderDetailEntity.getProductDate()); + stockPrintEntity.setExpireDate(stockOrderDetailEntity.getExpireDate()); + stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo()); + stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId()); + stockPrintEntities.add(stockPrintEntity); + } + } else { + StockPrintEntity stockPrintEntity = new StockPrintEntity(); + stockPrintEntity.setNameCode(stockOrderDetailEntity.getProductId()); + stockPrintEntity.setSOrderId(stockOrderEntity.getId()); + stockPrintEntity.setUpdateTime(new Date()); + stockPrintEntity.setProduceDate(stockOrderDetailEntity.getProductDate()); + stockPrintEntity.setExpireDate(stockOrderDetailEntity.getExpireDate()); + stockPrintEntity.setBatchNo(stockOrderDetailEntity.getBatchNo()); + stockPrintEntity.setSDetailId(stockOrderDetailEntity.getId()); + stockPrintEntities.add(stockPrintEntity); + } + } + + PostStockPrintRequest postStockPrintRequest = new PostStockPrintRequest(); + postStockPrintRequest.setThirdSys(stockOrderEntity.getThirdSysFk()); + postStockPrintRequest.setDatas(stockPrintEntities); + if (stockPrintEntities.size() > 0) { + generateQRCodeText(postStockPrintRequest); + } + } + return ResultVOUtils.success("操作成功，生成中。"); + } + + private String generateQRCodeText(PostStockPrintRequest postStockPrintRequest) { + String genKey = null; + if (postStockPrintRequest != null) { + +// InCodeLogEntity inCodeLogEntity = new InCodeLogEntity(); +// inCodeLogEntity.setFromType(IncodeStatus.FROM_THRSYS); +// inCodeLogEntity.setUpdateTime(new Date(System.currentTimeMillis())); +// if (postStockPrintRequest.getGenKey() == null) { +// genKey = CustomUtil.getId(); +// inCodeLogEntity.setGenKey(genKey); +// } else { +// genKey = postStockPrintRequest.getGenKey(); +// inCodeLogEntity.setGenKey(postStockPrintRequest.getGenKey()); +// } +// inCodeLogEntity.setStatus(IncodeStatus.PROCESS); +// inCodeLogEntity.setThirdSysFk(postStockPrintRequest.getThirdSys()); +// inCodeLogService.insertInCodeLog(inCodeLogEntity); + + List stockPrintEntities = postStockPrintRequest.getDatas(); + if (stockPrintEntities != null && stockPrintEntities.size() > 0) { + for (StockPrintEntity stockPrintEntity : stockPrintEntities) { + + StockPrinttREntity stockPrinttREntity = new StockPrinttREntity(); + BeanUtils.copyProperties(stockPrintEntity, stockPrinttREntity); + stockPrintEntity.setGenKeyFk(genKey); + String udiCode = "#" + stockPrinttREntity.getNameCode() + "#" + stockPrinttREntity.getProduceDate() + "#" + stockPrinttREntity.getExpireDate() + + "#" + stockPrinttREntity.getBatchNo() + "#" + stockPrinttREntity.getSerialNo() + "#" + stockPrinttREntity.getWarehouseCode() + "#" + stockPrinttREntity.getSpaceCode(); + stockPrintEntity.setUdiCode(udiCode); + stockPrintService.insertStockPrint(stockPrintEntity); + + //-------------------------- + StockQRCodeTextEntity stockQRCodeTextEntity = new StockQRCodeTextEntity(); + stockQRCodeTextEntity.setOrderId(stockPrintEntity.getSOrderId()); + stockQRCodeTextEntity.setDetailId(stockPrintEntity.getSDetailId()); + stockQRCodeTextEntity.setStatus(101 + "");//生成完成 + stockQRCodeTextEntity.setText(genKey); + Date tDate = new Date(); + stockQRCodeTextEntity.setCreate_time(tDate); + stockQRCodeTextEntity.setUpdate_time(tDate); + stockQRCodeTextService.insertStockQRCodeText(stockQRCodeTextEntity); + } + } +// inCodeLogEntity.setStatus(IncodeStatus.FINISH); +// inCodeLogService.updateInCodeLog(inCodeLogEntity); + } + return genKey; + } + + @GetMapping("/udiwms/stock/order/generateBillNo") + public BaseResponse stockOrderGenerateBillNo(@RequestParam("action") String action) { + + String billNo = StockOrderBillNoUtils.getBillNo(action); + + return ResultVOUtils.success(billNo); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java new file mode 100644 index 00000000..e0386f83 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderDetailController.java @@ -0,0 +1,475 @@ +package com.glxp.api.admin.controller.business; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.basic.UdiEntity; +import com.glxp.api.admin.entity.basic.UdiInfoEntity; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; +import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.admin.req.business.StockOrderIdsRequest; +import com.glxp.api.admin.req.info.SystemParamConfigRequest; +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.business.StockOrderDetailQueryProductResponse; +import com.glxp.api.admin.res.business.StockOrderDetailResponse; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.business.StockOrderDetailService; +import com.glxp.api.admin.service.business.StockOrderDetailTempService; +import com.glxp.api.admin.service.business.StockQRCodeTextService; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.thread.IoTransInoutService; +import com.glxp.api.admin.util.FilterUdiUtils; +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + +@RestController +public class StockOrderDetailController { + + @Resource + StockOrderDetailService stockOrderDetailService; + @Resource + StockOrderDetailTempService stockOrderDetailTempService; + @Resource + StockQRCodeTextService stockQRCodeTextService; + @Resource + UdiInfoService udiInfoService; + @Resource + private UdiRelevanceService udiRelevanceService; + + @Resource + private IoTransInoutService transInoutService; + @Autowired + private SystemParamConfigService systemParamConfigService; + + @GetMapping("/udiwms/stock/order/detail/filter") + public BaseResponse filterStockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List stockOrderDetailEntityList + = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(stockOrderDetailEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(stockOrderDetailEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/stock/order/detail/filter2") + public BaseResponse filterStockOrderDetail2(StockOrderDetailFilterRequest stockOrderDetailFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List stockOrderDetailResponseList + = stockOrderDetailService.filterStockOrderDetail2(stockOrderDetailFilterRequest); + PageInfo pageInfo; + for (StockOrderDetailResponse stockOrderDetailResponse : stockOrderDetailResponseList) { + stockOrderDetailResponse.setProductName(stockOrderDetailResponse.getCpmctymc()); + stockOrderDetailResponse.setSpec(stockOrderDetailResponse.getGgxh()); + } + pageInfo = new PageInfo<>(stockOrderDetailResponseList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(stockOrderDetailResponseList); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/stock/order/detail/temp/filter") + public BaseResponse filterStockOrderDetailTemp(StockOrderDetailFilterRequest stockOrderDetailFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List stockOrderDetailEntityList + = stockOrderDetailTempService.filterStockOrderDetailTemp(stockOrderDetailFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(stockOrderDetailEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(stockOrderDetailEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @GetMapping("/udiwms/stock/order/detail/getStockOrderDetails") + public BaseResponse getStockOrderDetails(StockOrderDetailFilterRequest stockOrderDetailFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List stockOrderDetailEntityList + = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(stockOrderDetailEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(stockOrderDetailEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + + @GetMapping(value = "/udiwms/stock/order/detail") + public BaseResponse stockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (stockOrderDetailFilterRequest.getOrderIdFk() == null || stockOrderDetailFilterRequest.getOrderIdFk().equals("")) { + stockOrderDetailFilterRequest.setOrderIdFk("1"); + } + stockOrderDetailFilterRequest.setPage(1); + stockOrderDetailFilterRequest.setLimit(100); + List erpOrderEntities = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest); + return ResultVOUtils.success(erpOrderEntities); + } + + @GetMapping("/udiwms/stock/order/detail/uploadCount") + public BaseResponse uploadCount(@RequestParam("orderId") String orderId, @RequestParam("code") String code) { + UdiEntity udiEntity = FilterUdiUtils.getUdi(code); + if (udiEntity == null) + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "条码错误 1"); + if (StringUtils.isBlank(udiEntity.getUdi())) + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "条码错误 2"); + + UdiInfoEntity udiInfoEntity = + udiInfoService.findByNameCode(udiEntity.getUdi()); + if (udiInfoEntity == null) { + return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品"); + } + + StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest(); + stockOrderDetailFilterRequest.setOrderIdFk(orderId); + stockOrderDetailFilterRequest.setProductId(udiEntity.getUdi()); + List stockOrderDetailEntityList = + stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest); + if (stockOrderDetailEntityList.size() > 0) { + SystemParamConfigEntity systemParamConfigEntitySODCountMax = + systemParamConfigService.selectByParamKey("stock_order_detail_count_max"); + + StockOrderDetailEntity tempStockOrderDetailEntity = stockOrderDetailEntityList.get(0); + StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); + stockOrderDetailEntity.setId(tempStockOrderDetailEntity.getId()); + + if (systemParamConfigEntitySODCountMax == null || + StringUtils.isNotBlank(systemParamConfigEntitySODCountMax.getParamValue()) && + systemParamConfigEntitySODCountMax.getParamValue().equals("1")) { + if (Integer.parseInt(tempStockOrderDetailEntity.getCount()) < + Integer.parseInt(tempStockOrderDetailEntity.getReCount())) { + return ResultVOUtils.error(500, "配货数量超过订单数量"); + } + } + stockOrderDetailEntity.setReCount( + String.valueOf(Integer.parseInt(tempStockOrderDetailEntity.getReCount()) + 1)); + stockOrderDetailService.updateById(stockOrderDetailEntity); + + return ResultVOUtils.success(orderId); + } + + return ResultVOUtils.error(ResultEnum.DATA_NOT); + } + + @GetMapping("/udiwms/stock/order/detail/getInstrument") + public BaseResponse getStockOrderDetailInstrument(@RequestParam("count") String count, @RequestParam("code") String code) { + UdiEntity udiEntity = FilterUdiUtils.getUdi(code); + if (udiEntity == null) ResultVOUtils.error(ResultEnum.DATA_ERROR, "条码错误 1"); + + UdiInfoEntity udiInfoEntity = + udiInfoService.findByNameCode(udiEntity.getUdi()); + if (udiInfoEntity != null) { + StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); + stockOrderDetailEntity.setProductId(udiInfoEntity.getNameCode()); + stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc()); + stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh()); + stockOrderDetailEntity.setBatchNo(udiEntity.getBatchNo()); + stockOrderDetailEntity.setProductDate(udiEntity.getProduceDate()); + stockOrderDetailEntity.setExpireDate(udiEntity.getExpireDate()); + stockOrderDetailEntity.setCount(count); + + return ResultVOUtils.success(stockOrderDetailEntity); + } + + return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品"); + } + + @PostMapping("/udiwms/stock/order/detail/getInstrumentById") + public BaseResponse getStockOrderDetailInstrumentById(@RequestBody StockOrderIdsRequest stockOrderIdsRequest) { + + List stockOrderDetailEntityList = new ArrayList<>(); + for (String id : stockOrderIdsRequest.getIds()) { + FilterUdiInfoRequest companyProductRelevanceRequest = new FilterUdiInfoRequest(); + companyProductRelevanceRequest.setId(id); + companyProductRelevanceRequest.setDiType(1); + List companyProductRelevanceResponses = udiRelevanceService.filterUdiGp(companyProductRelevanceRequest); + + if (companyProductRelevanceResponses != null && companyProductRelevanceResponses.size() > 0) { + UdiRelevanceResponse udiInfoEntity = companyProductRelevanceResponses.get(0); + StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); + stockOrderDetailEntity.setProductId(udiInfoEntity.getId() + ""); + stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc()); + stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh()); + if (stockOrderIdsRequest.getUdiEntity() != null) { + UdiEntity udiEntity = stockOrderIdsRequest.getUdiEntity(); + stockOrderDetailEntity.setBatchNo(udiEntity.getBatchNo()); + stockOrderDetailEntity.setProductDate(udiEntity.getProduceDate()); + stockOrderDetailEntity.setExpireDate(udiEntity.getExpireDate()); + } + stockOrderDetailEntity.setCount(0 + ""); + stockOrderDetailEntity.setReCount(0 + ""); + stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc()); + stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh()); + stockOrderDetailEntityList.add(stockOrderDetailEntity); + } + } + if (stockOrderDetailEntityList.size() == 0) { + return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到产品"); + } + return ResultVOUtils.success(stockOrderDetailEntityList); + } + + @GetMapping("/udiwms/stock/order/detail/addFromCode") + public BaseResponse addStockOrderDetailFromCode(@RequestParam("orderId") String orderId, + @RequestParam("count") String count, + @RequestParam("code") String code) { + UdiEntity udiEntity = FilterUdiUtils.getUdi(code); + if (udiEntity == null) ResultVOUtils.error(ResultEnum.DATA_ERROR, "条码错误 1"); + + UdiInfoEntity udiInfoEntity = + udiInfoService.findByNameCode(udiEntity.getUdi()); + if (udiInfoEntity != null) { + StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest(); + stockOrderDetailFilterRequest.setOrderIdFk(orderId); + stockOrderDetailFilterRequest.setProductId(udiEntity.getUdi()); + stockOrderDetailFilterRequest.setBatchNo(udiEntity.getBatchNo()); + stockOrderDetailFilterRequest.setProductDate(udiEntity.getProduceDate()); + stockOrderDetailFilterRequest.setExpireDate(udiEntity.getExpireDate()); + if (stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest).size() > 0) { + return ResultVOUtils.error(ResultEnum.DATA_REPEAT, "已添加"); + } + + StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); + stockOrderDetailEntity.setOrderIdFk(orderId); + stockOrderDetailEntity.setProductId(udiInfoEntity.getNameCode()); + stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc()); + stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh()); + stockOrderDetailEntity.setBatchNo(udiEntity.getBatchNo()); + stockOrderDetailEntity.setProductDate(udiEntity.getProduceDate()); + stockOrderDetailEntity.setExpireDate(udiEntity.getExpireDate()); + stockOrderDetailEntity.setCount(count); + stockOrderDetailEntity.setReCount(count); + stockOrderDetailEntity.setSweepCount(0 + ""); + stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc()); + stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh()); + + stockOrderDetailService.insertStockOrderDetail(stockOrderDetailEntity); + + return ResultVOUtils.success(); + } + + return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品"); + } + + @GetMapping("/udiwms/stock/order/detail/addFromCodeById") + public BaseResponse addStockOrderDetailFromCodeById(@RequestParam("orderId") String orderId, + @RequestParam("id") String id) { + UdiInfoEntity udiInfoEntity = + udiInfoService.findByNameCode(id); + if (udiInfoEntity != null) { + + StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); + stockOrderDetailEntity.setOrderIdFk(orderId); + stockOrderDetailEntity.setProductId(udiInfoEntity.getNameCode()); + stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc()); + stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh()); + stockOrderDetailEntity.setBatchNo(udiInfoEntity.getBatchNo()); + stockOrderDetailEntity.setProductDate(udiInfoEntity.getProduceDate()); + stockOrderDetailEntity.setExpireDate(udiInfoEntity.getExpireDate()); + stockOrderDetailEntity.setCount(0 + ""); + stockOrderDetailEntity.setReCount(0 + ""); + stockOrderDetailEntity.setSweepCount(0 + ""); + stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc()); + stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh()); + + stockOrderDetailService.insertStockOrderDetail(stockOrderDetailEntity); + + return ResultVOUtils.success(); + } + + return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该产品"); + } + + @GetMapping("/udiwms/stock/order/detail/queryProduct") + public BaseResponse queryProduct(@RequestParam("code") String code, @RequestParam("customerId") String customerId) { + UdiEntity udiEntity = null; + if (StringUtils.isNotBlank(code)) { + + if (code.length() > 13) { + String tStr = code.substring(0, 2); + if (tStr.contains("MA") || tStr.contains("#") || tStr.contains("01")) { + try { + udiEntity = FilterUdiUtils.getUdi(code); + } catch (Exception e) { + + } + } + } + StockOrderDetailQueryProductResponse stockOrderDetailQueryProductResponse = new StockOrderDetailQueryProductResponse(); + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + + if (udiEntity == null) { + filterUdiInfoRequest.setUnionCode(code); + stockOrderDetailQueryProductResponse.setUdi(code); + } else { + filterUdiInfoRequest.setUnionCode(udiEntity.getUdi()); + BeanUtils.copyProperties(udiEntity, stockOrderDetailQueryProductResponse); + } + List basicInstrumentMaintainRelevanceResponses = null; + basicInstrumentMaintainRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + if (basicInstrumentMaintainRelevanceResponses.size() == 1) { + stockOrderDetailQueryProductResponse.setGetType("1"); + stockOrderDetailQueryProductResponse.setGetId(basicInstrumentMaintainRelevanceResponses.get(0).getId() + ""); + } else if (basicInstrumentMaintainRelevanceResponses.size() > 1) { + stockOrderDetailQueryProductResponse.setGetType("2"); + } else { + return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到产品"); + } + return ResultVOUtils.success(stockOrderDetailQueryProductResponse); + } else { + return ResultVOUtils.error(ResultEnum.DATA_NOT, "条码不能为空"); + } + + } + + @GetMapping("/udiwms/stock/order/detail/filterProduct") + public BaseResponse filterProduct(FilterUdiInfoRequest filterUdiInfoRequest) { + + String nameCode = null; + + UdiEntity udiEntity = null; + + if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().isEmpty()) { + udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode()); + } + + if (udiEntity != null) { + nameCode = udiEntity.getUdi(); + } else { + nameCode = filterUdiInfoRequest.getNameCode(); + } + + filterUdiInfoRequest.setNameCode(nameCode); + filterUdiInfoRequest.setDiType(1); + List basicInstrumentMaintainRelevanceResponses = null; + basicInstrumentMaintainRelevanceResponses = udiRelevanceService.filterUdiGp(filterUdiInfoRequest); + + //todo 为什么要把去掉使用单元 +// if (basicInstrumentMaintainRelevanceResponses != null && basicInstrumentMaintainRelevanceResponses.size() > 0) { +// for (CompanyProductRelevanceResponse basicInstrumentMaintainRelevanceResponse : basicInstrumentMaintainRelevanceResponses) { +// if (basicInstrumentMaintainRelevanceResponse.getDiType() == 2 && basicInstrumentMaintainRelevanceResponse.getIsUseDy() != 1) { +// basicInstrumentMaintainRelevanceResponse.setNameCode(basicInstrumentMaintainRelevanceResponse.getSjcpbm()); +// } +// } +// } + + PageInfo pageInfo; + pageInfo = new PageInfo<>(basicInstrumentMaintainRelevanceResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(basicInstrumentMaintainRelevanceResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + @GetMapping("/udiwms/stock/order/detail/copy") + public BaseResponse uploadCount(@RequestParam("id") String id) { + if (StringUtils.isNotBlank(id)) { + StockOrderDetailEntity stockOrderDetailEntity = stockOrderDetailService.findOne(id); + if (stockOrderDetailEntity != null) { + stockOrderDetailEntity.setId(null); +// stockOrderDetailEntity.setReCount(0 + ""); + stockOrderDetailService.insertStockOrderDetail(stockOrderDetailEntity); + return ResultVOUtils.success(); + } + } + return ResultVOUtils.error(ResultEnum.DATA_NOT); + } + + + @GetMapping(value = "/udiwms/stock/order/detail/upload") + public BaseResponse upload(StockOrderDetailFilterRequest stockOrderDetailFilterRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + if (StringUtils.isNotBlank(stockOrderDetailFilterRequest.getId())) { + if (StringUtils.isBlank(stockOrderDetailFilterRequest.getCount()) || + StringUtils.isBlank(stockOrderDetailFilterRequest.getReCount())) { + return ResultVOUtils.error(500, "获取数量失败"); + } + SystemParamConfigEntity systemParamConfigEntitySODCountMax = systemParamConfigService.selectByParamKey("stock_order_detail_count_max"); + if (systemParamConfigEntitySODCountMax == null) return ResultVOUtils.error(500, "获取设置失败"); + + if (StringUtils.isNotBlank(systemParamConfigEntitySODCountMax.getParamValue()) && + systemParamConfigEntitySODCountMax.getParamValue().equals("1")) { + if (Integer.parseInt(stockOrderDetailFilterRequest.getCount()) < + Integer.parseInt(stockOrderDetailFilterRequest.getReCount())) { + return ResultVOUtils.error(500, "数量超过订单数量"); + } + } + + StockOrderDetailEntity stockOrderDetailEntity = new StockOrderDetailEntity(); + BeanUtils.copyProperties(stockOrderDetailFilterRequest, stockOrderDetailEntity); + boolean b = stockOrderDetailService.updateById(stockOrderDetailEntity); + if (b) { + return ResultVOUtils.success(); + } + } + return ResultVOUtils.error(500, "修改失败"); + } + + @PostMapping("/udiwms/stock/order/detail/delete") + public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + boolean b = stockOrderDetailService.deleteById(deleteRequest.getId()); + if (b) { + return ResultVOUtils.success("删除成功"); + } else { + return ResultVOUtils.error(500, "删除失败"); + } + } + + @PostMapping("/udiwms/stock/order/detail/temp/delete") + public BaseResponse deleteTemp(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + boolean b = stockOrderDetailTempService.deleteById(deleteRequest.getId()); + if (b) { + return ResultVOUtils.success("删除成功"); + } else { + return ResultVOUtils.error(500, "删除失败"); + } + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java new file mode 100644 index 00000000..3586c333 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java @@ -0,0 +1,248 @@ +package com.glxp.api.admin.controller.business; + +import com.github.pagehelper.PageInfo; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.business.StockOrderEntity; +import com.glxp.api.admin.entity.business.StockOrderPrintEntity; +import com.glxp.api.admin.entity.business.StockQRCodeTextEntity; +import com.glxp.api.admin.entity.info.SystemPDFModuleEntity; +import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity; +import com.glxp.api.admin.entity.inventory.StockPrintEntity; +import com.glxp.api.admin.req.business.StockQRCodeTextFilterRequest; +import com.glxp.api.admin.req.inout.DeleteRequest; +import com.glxp.api.admin.req.itextpdf.InspectionPDFTemplateRequest; +import com.glxp.api.admin.req.itextpdf.StockQRCodeTextPDFTemplateRequest; +import com.glxp.api.admin.res.PageSimpleResponse; +import com.glxp.api.admin.service.basic.BussinessTypeService; +import com.glxp.api.admin.service.basic.UdiInfoService; +import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.business.StockOrderDetailService; +import com.glxp.api.admin.service.business.StockOrderDetailTempService; +import com.glxp.api.admin.service.business.StockOrderService; +import com.glxp.api.admin.service.business.StockQRCodeTextService; +import com.glxp.api.admin.service.info.SystemPDFModuleService; +import com.glxp.api.admin.service.info.SystemPDFTemplateService; +import com.glxp.api.admin.service.info.SystemParamConfigService; +import com.glxp.api.admin.service.inventory.InvStockPrintService; +import com.glxp.api.admin.thread.IoTransInoutService; +import com.glxp.api.admin.util.JasperUtils; +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.beans.factory.annotation.Autowired; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +@RestController +public class StockQRCodeTextController { + + @Resource + StockOrderService stockOrderService; + @Resource + StockOrderDetailService stockOrderDetailService; + @Resource + StockOrderDetailTempService stockOrderDetailTempService; + @Resource + StockQRCodeTextService stockQRCodeTextService; + @Resource + UdiInfoService udiInfoService; + @Resource + private UdiRelevanceService udiRelevanceService; + @Resource + private SystemPDFTemplateService systemPDFTemplateService; + @Resource + private SystemPDFModuleService systemPDFModuleService; + @Resource + private BussinessTypeService bussinessTypeService; + @Resource + InvStockPrintService stockPrintService; + + @Resource + private IoTransInoutService transInoutService; + @Autowired + private SystemParamConfigService systemParamConfigService; + + @GetMapping("/udiwms/stock/qrcode/text/filter") + public BaseResponse filterStockQRCodeText(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + List stockQRCodeTextEntityList + = stockQRCodeTextService.filterStockQRCodeText(stockQRCodeTextFilterRequest); + for (StockQRCodeTextEntity stockQRCodeTextEntity : stockQRCodeTextEntityList) { + StockOrderDetailEntity stockOrderDetailEntity = stockOrderDetailService.findOne(stockQRCodeTextEntity.getDetailId()); + if (stockOrderDetailEntity != null) { + stockQRCodeTextEntity.setCount(stockOrderDetailEntity.getCount()); + stockQRCodeTextEntity.setReCount(stockOrderDetailEntity.getReCount()); + } else { + stockQRCodeTextEntity.setCount("0"); + stockQRCodeTextEntity.setReCount("0"); + } + } + PageInfo pageInfo; + pageInfo = new PageInfo<>(stockQRCodeTextEntityList); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(stockQRCodeTextEntityList); + return ResultVOUtils.success(pageSimpleResponse); + } + + //-----------打印码 + @PostMapping("/udiwms/pdf/template/inspection/stock/qrcode/text/file") + public BaseResponse inspectionStockQRCodeTextPDFFromTemplateFile( + @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception { + + StockPrintEntity stockPrintEntity = stockPrintService.selectById(inspectionPDFTemplateRequest.getQueryId()); + if (stockPrintEntity == null) { + return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该码"); + } + SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(3 + ""); + if (systemPDFModuleEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误"); + SystemPDFTemplateEntity systemPDFTemplateEntity = + systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId())); + if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); + + + return ResultVOUtils.success(); + } + + @PostMapping("/udiwms/pdf/template/stock/qrcode/text/file") + public void stockQRCodeTextPDFFromTemplateFile( + @RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest, + HttpServletRequest request, HttpServletResponse response) throws Exception { + + + SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(3 + ""); + if (systemPDFModuleEntity == null) return; + SystemPDFTemplateEntity systemPDFTemplateEntity = + systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId())); + if (systemPDFTemplateEntity == null) return; + + StockPrintEntity stockPrintEntity = stockPrintService.selectById(stockQRCodeTextPDFTemplateRequest.getId()); + Map data = new HashMap(); + data.put("data", stockPrintEntity); + JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf"); + stockPrintEntity.setPrintStatus("102"); + stockPrintService.updateStockPrint(stockPrintEntity); + } + + //-----------打印订单 + @PostMapping("/udiwms/pdf/template/inspection/stock/order/file") + public BaseResponse inspectionStockOrderPDFFromTemplateFile( + @RequestBody InspectionPDFTemplateRequest inspectionPDFTemplateRequest) throws Exception { + + StockOrderEntity stockOrderEntity = + stockOrderService.findById(inspectionPDFTemplateRequest.getOrderId()); + if (stockOrderEntity == null) { + return ResultVOUtils.error(ResultEnum.DATA_NOT, "未找到该订单"); + } + + SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + ""); + if (systemPDFModuleEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误"); + SystemPDFTemplateEntity systemPDFTemplateEntity = + systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId())); + if (systemPDFTemplateEntity == null) return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误"); + + return ResultVOUtils.success(); + } + + @PostMapping("/udiwms/pdf/template/stock/order/file") + public void stockOrderPDFFromTemplateFile( + @RequestBody StockQRCodeTextPDFTemplateRequest stockQRCodeTextPDFTemplateRequest, + HttpServletRequest request, HttpServletResponse response) throws Exception { + + + /* + StockOrderEntity stockOrderEntity = + stockOrderService.findById(stockQRCodeTextPDFTemplateRequest.getId()); + if (stockOrderEntity == null) { + return; + } + + SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + ""); + if (systemPDFModuleEntity == null) return; + SystemPDFTemplateEntity systemPDFTemplateEntity = + systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId())); + if (systemPDFTemplateEntity == null) return; + stockQRCodeTextPDFTemplateRequest.setPath(systemPDFTemplateEntity.getPath()); + stockQRCodeTextPDFTemplateRequest.setRowCount(systemPDFTemplateEntity.getRowCount()); + stockQRCodeTextPDFTemplateRequest.setQrcodeCount(systemPDFTemplateEntity.getQrcodeCount()); + //----------------------------------------------- + stockQRCodeTextPDFTemplateRequest.setOrderId(stockOrderEntity.getId()); + + stockQRCodeTextPDFTemplateRequest.setBillNo(stockOrderEntity.getBillNo()); + + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(stockOrderEntity.getBillType()); + stockQRCodeTextPDFTemplateRequest.setActionName(bussinessTypeEntity == null ? " " : bussinessTypeEntity.getName()); + + StockOrderDetailFilterRequest stockOrderDetailFilterRequest = new StockOrderDetailFilterRequest(); + stockOrderDetailFilterRequest.setOrderIdFk(stockOrderEntity.getId()); + List stockOrderDetailEntityList = stockOrderDetailService.filterStockOrderDetail(stockOrderDetailFilterRequest); + + ITextPDFUtils.exportStockOrderPDFFromTemplateFile( + stockQRCodeTextPDFTemplateRequest, stockOrderEntity, stockOrderDetailEntityList, request, response); + */ + /*打印订单*/ + List list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId()); + if (list != null && list.size() > 0) { + + SystemPDFModuleEntity systemPDFModuleEntity = systemPDFModuleService.selectById(2 + ""); + if (systemPDFModuleEntity == null) return; + SystemPDFTemplateEntity systemPDFTemplateEntity = + systemPDFTemplateService.selectById(String.valueOf(systemPDFModuleEntity.getTemplateId())); + if (systemPDFTemplateEntity == null) return; + Map data = new HashMap(); + data.put("data", list); + JasperUtils.jasperReport(request, response, data, systemPDFTemplateEntity.getPath(), "pdf"); +// JasperUtils.jasperReport(request, response, data, "jaspers/order_print_1.jasper", "pdf"); + StockOrderEntity updateStockOrderEntity = new StockOrderEntity(); + updateStockOrderEntity.setId(stockQRCodeTextPDFTemplateRequest.getId()); + updateStockOrderEntity.setPrintStatus("102"); + stockOrderService.updateById(updateStockOrderEntity); + + } + } + + + @GetMapping(value = "/udiwms/stock/qrcode/text/upload") + public BaseResponse upload(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest, + BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + StockQRCodeTextEntity stockQRCodeTextEntity = new StockQRCodeTextEntity(); + BeanUtils.copyProperties(stockQRCodeTextFilterRequest, stockQRCodeTextEntity); + boolean b = stockQRCodeTextService.updateById(stockQRCodeTextEntity); + if (b) { + return ResultVOUtils.success(); + } + return ResultVOUtils.error(500, "修改失败"); + } + + @PostMapping("/udiwms/stock/qrcode/text/delete") + public BaseResponse delete(@RequestBody DeleteRequest deleteRequest, BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } + boolean b = stockQRCodeTextService.deleteById(deleteRequest.getId()); + if (b) { + return ResultVOUtils.success("删除成功"); + } else { + return ResultVOUtils.error(500, "删除失败"); + } + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemPDFTemplateController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemPDFTemplateController.java index be90d117..d407354f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemPDFTemplateController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/info/SystemPDFTemplateController.java @@ -39,7 +39,7 @@ public class SystemPDFTemplateController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - systemPDFTemplateRequest.setType(2); +// systemPDFTemplateRequest.setType(2); List systemPDFTemplateEntityList = systemPDFTemplateService.queryPage(systemPDFTemplateRequest); List systemPDFTemplateResponseList = systemPDFTemplateEntityList.stream().map(item -> { SystemPDFTemplateResponse systemPDFTemplateResponse = new SystemPDFTemplateResponse(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java index af96eab4..4615f084 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderController.java @@ -60,7 +60,8 @@ public class OrderController { private BussinessTypeService bussinessTypeService; @Resource private ThrOrderService thrOrderService; - + @Resource + InoutUtils inoutUtils; @GetMapping("udiwms/inout/order/status") public BaseResponse listOrderError(OrderFilterRequest orderFilterRequest) { @@ -228,13 +229,13 @@ public class OrderController { mainOrderEntity.setRemark("获取ERP单失败"); orderService.updateOrder(mainOrderEntity); List datas = warehouseService.findByReceiptId(mainOrder); - new InoutUtils().generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, datas); + inoutUtils.generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, datas); return ResultVOUtils.error(500, "获取ERP单失败"); } } else { new Thread(() -> { List datas = warehouseService.findByReceiptId(mainOrder); - new InoutUtils().generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, datas); + inoutUtils.generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, datas); }).start(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java index dea2eae8..98f38b6d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/OrderDetailController.java @@ -5,21 +5,24 @@ import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.info.SystemParamConfigEntity; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.business.StockOrderEntity; import com.glxp.api.admin.entity.inout.*; import com.glxp.api.admin.entity.thrsys.ThrOrderDetailEntity; import com.glxp.api.admin.entity.thrsys.ThrOrderEntity; import com.glxp.api.admin.httpclient.ErpOrderClient; +import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.admin.req.business.StockOrderFilterRequest; import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; -import com.glxp.api.admin.res.basic.BussinessTypResponse; import com.glxp.api.admin.res.inout.ErpOrderResponse; -import com.glxp.api.admin.res.inout.PurchaseinResponse; import com.glxp.api.admin.req.inout.*; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.service.basic.BussinessTypeService; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; +import com.glxp.api.admin.service.business.StockOrderDetailService; +import com.glxp.api.admin.service.business.StockOrderService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.inout.*; import com.glxp.api.admin.service.thrsys.ThrOrderDetailService; @@ -28,7 +31,6 @@ import com.glxp.api.admin.thread.IoTransInoutService; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import org.aspectj.lang.annotation.DeclareWarning; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.BindingResult; @@ -72,7 +74,8 @@ public class OrderDetailController { private StockOrderService stockOrderService; @Resource private StockOrderDetailService stockOrderDetailService; - + @Resource + ContrastErpUtil contrastErpUtil; @GetMapping("/udiwms/erpOrder/filter") public BaseResponse filterErpOrder(FilterOrderRequest filterErpOrderRequest, @@ -101,7 +104,7 @@ public class OrderDetailController { // return getLoaclData(filterErpOrderRequest); // } - if (basicThirdSysDetailEntity.getLocalAction() != null) { + if (basicThirdSysDetailEntity.getLocalAction() != null && basicThirdSysDetailEntity.getThirdSysFk() == null) { filterErpOrderRequest.setLocalAction(basicThirdSysDetailEntity.getLocalAction()); return getLoaclData(filterErpOrderRequest); } @@ -121,7 +124,6 @@ public class OrderDetailController { } - return baseResponse; } else { @@ -333,6 +335,7 @@ public class OrderDetailController { erpOrderEntity.setErpCount(Math.abs(subPurchase.getCount())); erpOrderEntity.setReCount(Math.abs(subPurchase.getReCount())); erpOrderEntity.setGoodsunit(subPurchase.getSpec()); + erpOrderEntities.add(erpOrderEntity); } } } @@ -360,10 +363,10 @@ public class OrderDetailController { } myErpOrderService.deleteByOrderId(importErpOrderRequest.getOrderId()); - List returnOrders = new ContrastErpUtil().transErp(erpOrderEntities, udiRelevanceService, importErpOrderRequest.getOrderId()); + List returnOrders = contrastErpUtil.transErp(erpOrderEntities, udiRelevanceService, importErpOrderRequest.getOrderId()); myErpOrderService.insertErpOrders(returnOrders); List warehouseEntityList = warehouseService.findByReceiptId(importErpOrderRequest.getOrderId()); - new ContrastErpUtil().contrastErp(udiInfoService, udiRelevanceService, + contrastErpUtil.contrastErp(udiInfoService, udiRelevanceService, myErpOrderService, orderService, warehouseEntityList, systemParamConfigService, bussinessTypeEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java index 04039584..c8d6d875 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/WareHouseController.java @@ -152,6 +152,7 @@ public class WareHouseController { PostOrderRequest.PostOrder postOrder = new PostOrderRequest.PostOrder(); postOrder.setOrderId(postOrderRequest.getOrderId()); postOrder.setBillType(postOrderRequest.getBillType()); + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(postOrderRequest.getBillType()); List warehouseEntityList = postOrderRequest.getCodes(); String date = DateUtil.formatDateTime(new Date()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java index 213392c1..8df6050f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/ContrastErpUtil.java @@ -14,6 +14,7 @@ import com.glxp.api.admin.req.basic.FilterUdiInfoRequest; import com.glxp.api.admin.req.inout.OrderFilterRequest; import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.service.basic.BasicThirdSysService; +import com.glxp.api.admin.service.basic.CustomService; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; @@ -36,6 +37,10 @@ public class ContrastErpUtil { String udiUrl = ""; @Resource InvProductsTrService invProductsTrService; + @Resource + CustomService customService; + @Resource + InoutUtils inoutUtils; public ContrastErpUtil() { @@ -62,10 +67,11 @@ public class ContrastErpUtil { String resultMsg = null; List errorData = new ArrayList<>(); for (WarehouseEntity warehouseEntity : warehouseEntityList) { - UdiInfoEntity udiInfoEntity = new InoutUtils(udiUrl).getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode()); - if (warehouseEntity.getCount() > 1) { - udiInfoEntity.setCount(warehouseEntity.getCount()); - } + UdiInfoEntity udiInfoEntity = inoutUtils.getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode()); +// if (warehouseEntity.getCount() > 1) { +// udiInfoEntity.setCount(warehouseEntity.getCount()); +// } + udiInfoEntity.setCount(customService.getActCount(warehouseEntity)); List udiRelevanceEntities = udiRelevanceService.selectByUuid(udiInfoEntity.getUuid()); if (udiRelevanceEntities != null && udiRelevanceEntities.size() > 0) { UdiRelevanceEntity udiRelevanceEntity = checkGoodsId(udiRelevanceEntities, bussinessTypeEntity); @@ -116,7 +122,7 @@ public class ContrastErpUtil { orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); orderService.updateOrder(orderEntity); if (errorData.size() > 0) { - new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, errorData); + inoutUtils.generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, errorData); } } @@ -235,6 +241,9 @@ public class ContrastErpUtil { erpOrderEntity.setPackRatio(temp.getPackRatio()); erpOrderEntity.setProductCompany(temp.getYlqxzcrbarmc()); erpOrderEntity.setOrderIdFk(orderFk); + }else { + erpOrderEntity.setCoName(erpOrderEntity.getGoodsname()); + erpOrderEntity.setPackSpec(erpOrderEntity.getGoodsunit()); } erpOrderEntity.setOrderIdFk(orderFk); String key = erpOrderEntity.getBatchNo() + erpOrderEntity.getGoodsid() + erpOrderEntity.getWarehouseCode(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java index f173fd19..268b887f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inout/utils/InoutUtils.java @@ -8,6 +8,8 @@ import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.inout.WarehouseEntity; import com.glxp.api.admin.entity.basic.UdiEntity; import com.glxp.api.admin.entity.inout.ErpOrderEntity; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import com.glxp.api.admin.service.basic.CustomService; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; @@ -15,22 +17,23 @@ import com.glxp.api.admin.service.inout.OrderDetailService; import com.glxp.api.admin.service.inout.CodesService; import com.glxp.api.admin.util.DateUtil; import com.glxp.api.admin.util.FilterUdiUtils; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +@Service public class InoutUtils { - String udiUrl = ""; - public InoutUtils() { + @Resource + CustomService customService; - } - - public InoutUtils(String udiUrl) { - this.udiUrl = udiUrl; - } + @Value("${UDI_SERVER_URL}") + private String udiUrl; public String filterCode(CodesService warehouseService, WarehouseEntity warehouseData, SystemParamConfigService setupService) { List warehouseEntityList = warehouseService.findByCode(warehouseData.getCode()); @@ -84,22 +87,22 @@ public class InoutUtils { public String nullVail(WarehouseEntity warehousetemp, SystemParamConfigService configService) { if (warehousetemp.getAction().equals(ConstantType.TYPE_PUT_RETURN)) { - SystemParamConfigEntity systemParamConfigEntity = configService.selectByParamKey("io_isReturnWareHouseIn"); - if (systemParamConfigEntity==null || "0".equals(systemParamConfigEntity.getParamValue())) { + SystemParamConfigEntity systemParamConfigEntity = configService.selectByParamKey("io_isReturnWareHouseIn"); + if (systemParamConfigEntity == null || "0".equals(systemParamConfigEntity.getParamValue())) { return null; } else { return warehousetemp.getCode() + "不允许未销售出库可以退货入库"; } } else if (warehousetemp.getAction().equals(ConstantType.TYPE_OUT_RETURN)) { - SystemParamConfigEntity systemParamConfigEntity = configService.selectByParamKey("io_isReturnWareHouseOut"); - if (systemParamConfigEntity==null || "0".equals(systemParamConfigEntity.getParamValue())) { + SystemParamConfigEntity systemParamConfigEntity = configService.selectByParamKey("io_isReturnWareHouseOut"); + if (systemParamConfigEntity == null || "0".equals(systemParamConfigEntity.getParamValue())) { return null; } else { return warehousetemp.getCode() + "不允许零库存退货出库"; } } else if (warehousetemp.getAction().equals(ConstantType.TYPE_OUT_SALE)) { - SystemParamConfigEntity systemParamConfigEntity = configService.selectByParamKey("io_isSalesWareHouseOut"); - if (systemParamConfigEntity==null || "1".equals(systemParamConfigEntity.getParamValue())) { + SystemParamConfigEntity systemParamConfigEntity = configService.selectByParamKey("io_isSalesWareHouseOut"); + if (systemParamConfigEntity == null || "1".equals(systemParamConfigEntity.getParamValue())) { return null; } else { return warehousetemp.getCode() + "不允许零库存销售出库"; @@ -169,9 +172,10 @@ public class InoutUtils { UdiInfoEntity udiInfoEntity = getUdiInfo(udiInfoService, udiRelevanceService, warehouseEntity.getCode()); if (udiInfoEntity != null) { if (warehouseEntity.getCount() != null) - udiInfoEntity.setCount(warehouseEntity.getCount()); + udiInfoEntity.setCount(customService.getActCount(warehouseEntity)); +// udiInfoEntity.setCount(warehouseEntity.getCount()); else { - udiInfoEntity.setCount(getActCount(udiInfoEntity)); + udiInfoEntity.setCount(customService.getActCount(warehouseEntity)); } udiInfoEntities.add(udiInfoEntity); } @@ -226,4 +230,6 @@ public class InoutUtils { } return 1; } + + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java index 1340fdf9..c93245de 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPrintController.java @@ -65,6 +65,25 @@ public class InvPrintController { return ResultVOUtils.success(pageSimpleResponse); } + @GetMapping("/spms/stockPrint/filter") + public BaseResponse filterSp(FilterStockprintRequest stockprintRequest, + BindingResult bindingResult) { + + if (bindingResult.hasErrors()) { + return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); + } +// String thirdSys = systemParamConfigService.selectValueByParamKey("incode_thirdSys_fromType"); +// stockprintRequest.setThirdSysFk(thirdSys); + List stockPrintEntities + = stockPrintService.filterStockPrint(stockprintRequest); + PageInfo pageInfo; + pageInfo = new PageInfo<>(stockPrintEntities); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(stockPrintEntities); + return ResultVOUtils.success(pageSimpleResponse); + } + @GetMapping("/udiwms/stockPrint/getFilter") public BaseResponse getFilter(FilterStockprintRequest stockprintRequest, BindingResult bindingResult) { diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java index 9da70e97..fc218a35 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrCorpsController.java @@ -62,7 +62,7 @@ public class ThrCorpsController { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } String id = deleteRequest.getId(); - thrCorpService.deleteById(id); + thrCorpService.deleteByUnitId(id); return ResultVOUtils.success("删除成功"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderExportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderExportLogController.java index 1cea41be..e20c2d96 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderExportLogController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrOrderExportLogController.java @@ -160,7 +160,7 @@ public class ThrOrderExportLogController { udiInfoExportLogEntity.setDlCount(0); thrOrderExportLogService.insertThrOrderExportLog(udiInfoExportLogEntity); thrOrdersDlService.uploadSmp(genKey, thrOrderExportRequest); - return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!"); + return ResultVOUtils.success("后台正在上传，请稍后刷新查看!"); } 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 05b21804..c80dfd74 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 @@ -168,7 +168,10 @@ public class ThrOrderImportLogController { } for (int k = sheet.getFirstRowNum() + 1; k <= sheet.getLastRowNum(); k++) { row = sheet.getRow(k); - if (row.getRowNum() <= 0) { + if (row == null || row.getRowNum() <= 0) { + continue; + } + if (filterEmpty(row)) { continue; } ThrOrderImportDetailEntity corpImportDetailEntity = new ThrOrderImportDetailEntity(); @@ -177,8 +180,6 @@ public class ThrOrderImportLogController { cell1.setCellType(CellType.STRING); corpImportDetailEntity.setBillNo(cell1.getStringCellValue()); } - - Cell cell2 = row.getCell(1); if (cell2 != null) { cell2.setCellType(CellType.STRING); @@ -286,4 +287,46 @@ public class ThrOrderImportLogController { return ResultVOUtils.success("上传成功"); } + + public boolean filterEmpty(Row row) { + + if (row.getCell(0) != null) { + row.getCell(0).setCellType(CellType.STRING); + } + if (row.getCell(1) != null) { + row.getCell(1).setCellType(CellType.STRING); + } + if (row.getCell(2) != null) { + row.getCell(2).setCellType(CellType.STRING); + } + if (row.getCell(3) != null) { + row.getCell(3).setCellType(CellType.STRING); + } + if (row.getCell(4) != null) { + row.getCell(4).setCellType(CellType.STRING); + } + if (row.getCell(5) != null) { + row.getCell(5).setCellType(CellType.STRING); + } + if (row.getCell(6) != null) { + row.getCell(6).setCellType(CellType.STRING); + } + 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(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())) + )) { + return true; + } + return false; + } + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsExportLogController.java b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsExportLogController.java index 6219f12f..21c6ba13 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsExportLogController.java +++ b/api-admin/src/main/java/com/glxp/api/admin/controller/thrsys/ThrProductsExportLogController.java @@ -117,7 +117,11 @@ public class ThrProductsExportLogController { @PostMapping("/udiwms/thrProducts/importLog/export") public BaseResponse excelDownload(@RequestBody ThrProductsExportRequest thrProductsExportRequest) { - String fileName = "D:\\udiwms\\exportFile\\" + "产品信息导出" + System.currentTimeMillis() + ".xls"; + + ThrProductsExportLogEntity thrProductsExportLogEntity = new ThrProductsExportLogEntity(); + thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); + String genKey = CustomUtil.getId(); + String fileName = "D:\\udiwms\\exportFile\\" + "第三方产品信息" + genKey + ".xls"; File file = new File(fileName); if (!file.exists()) { try { @@ -126,9 +130,6 @@ public class ThrProductsExportLogController { e.printStackTrace(); } } - ThrProductsExportLogEntity thrProductsExportLogEntity = new ThrProductsExportLogEntity(); - thrProductsExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_PROCESS); - String genKey = CustomUtil.getId(); thrProductsExportLogEntity.setGenKey(genKey); thrProductsExportLogEntity.setFilePath(fileName); thrProductsExportLogEntity.setUpdateTime(new Date()); @@ -154,7 +155,7 @@ public class ThrProductsExportLogController { thrProductsExportLogEntity.setType(BasicProcessStatus.EXPORT_SMP); thrProductsExportLogService.insertThrProductsExportLog(thrProductsExportLogEntity); thrProductsDlService.uploadSmp(genKey, thrProductsExportRequest); - return ResultVOUtils.success("后台正在导出生成excel文件，请稍后刷新查看!"); + return ResultVOUtils.success("后台正在上传，请稍后刷新查看!"); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthCheckDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthCheckDao.java new file mode 100644 index 00000000..23b9a262 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/auth/AuthCheckDao.java @@ -0,0 +1,22 @@ +package com.glxp.api.admin.dao.auth; + +import com.glxp.api.admin.entity.auth.AuthAdmin; +import com.glxp.api.admin.entity.auth.AuthCheckEntity; +import com.glxp.api.admin.req.auth.AuthCheckRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface AuthCheckDao { + + List filterDevices(AuthCheckRequest authCheckRequest); + + AuthCheckEntity findByMachine(String machineInfo); + + boolean insertDevices(AuthCheckEntity authCheckEntity); + + boolean updateDevices(AuthCheckEntity authCheckEntity); + + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java index 30b4990a..4d318997 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessLocalTypeDao.java @@ -13,6 +13,8 @@ public interface BussinessLocalTypeDao { List filterList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); + List filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); + BussinessLocalTypeEntity findBTByAction(String action); BussinessLocalTypeEntity findBTByName(String name); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessOriginTypeDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessOriginTypeDao.java new file mode 100644 index 00000000..b1f6fd3c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/basic/BussinessOriginTypeDao.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.dao.basic; + +import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity; +import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface BussinessOriginTypeDao { + + List filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/StockOrderDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDao.java similarity index 68% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inout/StockOrderDao.java rename to api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDao.java index 9853de57..d2057b10 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/StockOrderDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDao.java @@ -1,8 +1,9 @@ -package com.glxp.api.admin.dao.inout; +package com.glxp.api.admin.dao.business; -import com.glxp.api.admin.entity.inout.StockOrderEntity; -import com.glxp.api.admin.req.inout.StockOrderFilterRequest; -import com.glxp.api.admin.req.inout.StockOrderQueryRequest; +import com.glxp.api.admin.entity.business.StockOrderEntity; +import com.glxp.api.admin.entity.business.StockOrderPrintEntity; +import com.glxp.api.admin.req.business.StockOrderFilterRequest; +import com.glxp.api.admin.req.business.StockOrderQueryRequest; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -28,4 +29,6 @@ public interface StockOrderDao { List filterListOr(StockOrderFilterRequest stockOrderFilterRequest); StockOrderEntity findOne(StockOrderFilterRequest stockOrderFilterRequest); + + List listOrderPrint(StockOrderFilterRequest stockOrderFilterRequest); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/StockOrderDetailDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDetailDao.java similarity index 66% rename from api-admin/src/main/java/com/glxp/api/admin/dao/inout/StockOrderDetailDao.java rename to api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDetailDao.java index 09ffba54..00609323 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inout/StockOrderDetailDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDetailDao.java @@ -1,7 +1,8 @@ -package com.glxp.api.admin.dao.inout; +package com.glxp.api.admin.dao.business; -import com.glxp.api.admin.entity.inout.StockOrderDetailEntity; -import com.glxp.api.admin.req.inout.StockOrderDetailFilterRequest; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.admin.res.business.StockOrderDetailResponse; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -12,6 +13,8 @@ public interface StockOrderDetailDao { List filterStockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest); + List filterStockOrderDetail2(StockOrderDetailFilterRequest stockOrderDetailFilterRequest); + boolean insertStockOrderDetail(StockOrderDetailEntity stockOrderDetailEntity); boolean insertStockOrderDetails(@Param("stockOrderDetailEntities") List stockOrderDetailEntitys); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDetailTempDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDetailTempDao.java new file mode 100644 index 00000000..d0fce20c --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockOrderDetailTempDao.java @@ -0,0 +1,26 @@ +package com.glxp.api.admin.dao.business; + +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface StockOrderDetailTempDao { + + List filterStockOrderDetailTemp(StockOrderDetailFilterRequest stockOrderDetailFilterRequest); + + boolean insertStockOrderDetailTemp(StockOrderDetailEntity stockOrderDetailEntity); + + boolean insertStockOrderDetailTemps(@Param("stockOrderDetailEntities") List stockOrderDetailEntities); + + boolean updateById(StockOrderDetailEntity stockOrderDetailEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByOrderIdFk(@Param("id") String id); + + StockOrderDetailEntity findOne(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockQRCodeTextDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockQRCodeTextDao.java new file mode 100644 index 00000000..6c4bbd0f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/business/StockQRCodeTextDao.java @@ -0,0 +1,26 @@ +package com.glxp.api.admin.dao.business; + +import com.glxp.api.admin.entity.business.StockQRCodeTextEntity; +import com.glxp.api.admin.req.business.StockQRCodeTextFilterRequest; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface StockQRCodeTextDao { + + List filterStockQRCodeText(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest); + + boolean insertStockQRCodeText(StockQRCodeTextEntity stockQRCodeTextEntity); + + boolean insertStockQRCodeTexts(@Param("StockQRCodeTextEntities") List StockQRCodeTextEntitys); + + boolean updateById(StockQRCodeTextEntity stockQRCodeTextEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByOrderId(@Param("id") String id); + + StockQRCodeTextEntity findOne(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java index 3566524a..d40e8325 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvStockPrintDao.java @@ -23,8 +23,10 @@ public interface InvStockPrintDao { boolean updateStockPrint(StockPrintEntity udiInfoEntity); boolean deleteById(@Param("id") String id); + boolean deleteByGenKey(@Param("genKey") String genKey); + boolean deleteByOrderId(@Param("sOrderId") String sOrderId); boolean updatePrintStatus(@Param("ids") List ids); diff --git a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpDao.java b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpDao.java index 6dbee327..b3a354cd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpDao.java +++ b/api-admin/src/main/java/com/glxp/api/admin/dao/thrsys/ThrCorpDao.java @@ -20,5 +20,7 @@ public interface ThrCorpDao { boolean deleteById(@Param("id") String id); + boolean deleteByUnitId(@Param("unitId") String unitId); + boolean deleteAll(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthCheckEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthCheckEntity.java new file mode 100644 index 00000000..5644d0cf --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/auth/AuthCheckEntity.java @@ -0,0 +1,14 @@ +package com.glxp.api.admin.entity.auth; + +import lombok.Data; + +import java.util.Date; + +@Data +public class AuthCheckEntity { + private Integer id; + private String machineInfo; + private String remark; + private String registerCode; + private Date createDate; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysDetailEntity.java index f05d7b27..9e000c36 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BasicThirdSysDetailEntity.java @@ -11,11 +11,19 @@ public class BasicThirdSysDetailEntity { private Boolean enabled; private Boolean itrCache; private String guideUrl; + private String thridUrl; private String remark; private String thirdSysFk; private String name; private Integer fromType; private String localAction; - + public String getValue() { + if (value == null) + return null; + else if (thridUrl != null) + return thridUrl + value; + else + return value; + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessLocalTypeEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessLocalTypeEntity.java index 09d48cc1..18358076 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessLocalTypeEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessLocalTypeEntity.java @@ -10,6 +10,7 @@ public class BussinessLocalTypeEntity { private String name; private String remark; private Boolean enable; - - + private String originAction; + private String localName; + private String localAction; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessOriginTypeEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessOriginTypeEntity.java new file mode 100644 index 00000000..8f31a154 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/BussinessOriginTypeEntity.java @@ -0,0 +1,11 @@ +package com.glxp.api.admin.entity.basic; + +import lombok.Data; + +@Data +public class BussinessOriginTypeEntity { + private String id; + private String name; + private String action; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportDetailEntity.java index 80b7c388..9564f5e2 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/basic/UdiInfoImportDetailEntity.java @@ -20,6 +20,6 @@ public class UdiInfoImportDetailEntity { private Date updateTime; private String remark; private String genKeyFk; - + private String isUseDy; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/StockOrderDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/StockOrderDetailEntity.java rename to api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java index 0b7b308f..367f31fb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/StockOrderDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderDetailEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.admin.entity.business; import lombok.Data; @@ -16,5 +16,7 @@ public class StockOrderDetailEntity { private String count; private String reCount; private String sweepCount; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/StockOrderEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/StockOrderEntity.java rename to api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java index e70033ad..7bb229fc 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/StockOrderEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.admin.entity.business; import lombok.Data; @@ -17,5 +17,7 @@ public class StockOrderEntity { private String statusInfo; private String type; private String sourceType; - private String status2; + private String printStatus; + private String unitIdFk; + private String customerId; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java new file mode 100644 index 00000000..7b12eb64 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.entity.business; + +import lombok.Data; + +@Data +public class StockOrderPrintEntity extends StockOrderDetailEntity { + + private String id; + private String billNo; + private String billdate; + private String corpId; + private String corpName; + private String billType; + private String billFlag; + private String thirdSysFk; + private String status; + private String statusInfo; + private String type; + private String sourceType; + private String printStatus; + private String unitIdFk; + private String customerId; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/StockQRCodeTextEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockQRCodeTextEntity.java similarity index 92% rename from api-admin/src/main/java/com/glxp/api/admin/entity/inout/StockQRCodeTextEntity.java rename to api-admin/src/main/java/com/glxp/api/admin/entity/business/StockQRCodeTextEntity.java index e4057f34..6b8b60b3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/StockQRCodeTextEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/business/StockQRCodeTextEntity.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.entity.inout; +package com.glxp.api.admin.entity.business; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemPDFModuleEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemPDFModuleEntity.java index c9a7a15e..4fa50a27 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemPDFModuleEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/info/SystemPDFModuleEntity.java @@ -15,4 +15,6 @@ public class SystemPDFModuleEntity { private String remark; private Date create_time; private Date update_time; + private String templateDlUrl; + private Integer templateType; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java index 1aa8e789..805c144d 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inout/WarehouseEntity.java @@ -22,4 +22,5 @@ public class WarehouseEntity { private String packageLevel; private String warehouseCode; private String nameCode; + private Integer sCount; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintEntity.java index 0efa5155..03137ded 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrintEntity.java @@ -2,9 +2,11 @@ package com.glxp.api.admin.entity.inventory; import lombok.Data; +import java.util.Date; + @Data public class StockPrintEntity { - private int id; + private Integer id; private String udiRlIdFk; private String udiCode; private String nameCode; @@ -28,4 +30,8 @@ public class StockPrintEntity { private String nnum; private String genKeyFk; + private String sOrderId; + private String sDetailId; + private Date updateTime; + } diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrinttREntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrinttREntity.java new file mode 100644 index 00000000..4b55bf65 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/inventory/StockPrinttREntity.java @@ -0,0 +1,262 @@ +package com.glxp.api.admin.entity.inventory; + +import java.util.Date; + +public class StockPrinttREntity { + + private int id; + private String udiRlIdFk; + private String udiCode; + private String nameCode; + private String cpmctymc; + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + private String codeType; + private String thirdId; + private String thirdName; + private String printStatus; + private String ggxh; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; + private String warehouseName; + private String warehouseCode; + private String spaceCode; + private String spaceName; + private String thirdSysFk; + private String nnum; + private String genKeyFk; + + private String sOrderId; + private String sDetailId; + private Date updateTime; + + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getUdiRlIdFk() { + return udiRlIdFk; + } + + public void setUdiRlIdFk(String udiRlIdFk) { + this.udiRlIdFk = udiRlIdFk; + } + + public String getUdiCode() { + return udiCode; + } + + public void setUdiCode(String udiCode) { + this.udiCode = udiCode; + } + + public String getNameCode() { + return nameCode; + } + + public void setNameCode(String nameCode) { + this.nameCode = nameCode; + } + + public String getCpmctymc() { + return cpmctymc; + } + + public void setCpmctymc(String cpmctymc) { + this.cpmctymc = cpmctymc; + } + + public String getBatchNo() { + if(batchNo==null){ + return ""; + } + return batchNo; + } + + public void setBatchNo(String batchNo) { + this.batchNo = batchNo; + } + + public String getProduceDate() { + if(produceDate==null){ + return ""; + } + return produceDate; + } + + public void setProduceDate(String produceDate) { + + this.produceDate = produceDate; + } + + public String getExpireDate() { + if(expireDate==null){ + return ""; + } + return expireDate; + } + + public void setExpireDate(String expireDate) { + this.expireDate = expireDate; + } + + public String getSerialNo() { + if(serialNo==null){ + return ""; + } + return serialNo; + } + + public void setSerialNo(String serialNo) { + this.serialNo = serialNo; + } + + public String getCodeType() { + return codeType; + } + + public void setCodeType(String codeType) { + this.codeType = codeType; + } + + public String getThirdId() { + return thirdId; + } + + public void setThirdId(String thirdId) { + this.thirdId = thirdId; + } + + public String getThirdName() { + return thirdName; + } + + public void setThirdName(String thirdName) { + this.thirdName = thirdName; + } + + public String getPrintStatus() { + return printStatus; + } + + public void setPrintStatus(String printStatus) { + this.printStatus = printStatus; + } + + public String getGgxh() { + return ggxh; + } + + public void setGgxh(String ggxh) { + this.ggxh = ggxh; + } + + public String getYlqxzcrbarmc() { + return ylqxzcrbarmc; + } + + public void setYlqxzcrbarmc(String ylqxzcrbarmc) { + this.ylqxzcrbarmc = ylqxzcrbarmc; + } + + public String getZczbhhzbapzbh() { + return zczbhhzbapzbh; + } + + public void setZczbhhzbapzbh(String zczbhhzbapzbh) { + this.zczbhhzbapzbh = zczbhhzbapzbh; + } + + public String getWarehouseName() { + return warehouseName; + } + + public void setWarehouseName(String warehouseName) { + this.warehouseName = warehouseName; + } + + public String getWarehouseCode() { + if(warehouseCode==null){ + return ""; + } + return warehouseCode; + } + + public void setWarehouseCode(String warehouseCode) { + this.warehouseCode = warehouseCode; + } + + public String getSpaceCode() { + if(spaceCode==null){ + return ""; + } + return spaceCode; + } + + public void setSpaceCode(String spaceCode) { + this.spaceCode = spaceCode; + } + + public String getSpaceName() { + return spaceName; + } + + public void setSpaceName(String spaceName) { + this.spaceName = spaceName; + } + + public String getThirdSysFk() { + return thirdSysFk; + } + + public void setThirdSysFk(String thirdSysFk) { + this.thirdSysFk = thirdSysFk; + } + + public String getNnum() { + return nnum; + } + + public void setNnum(String nnum) { + this.nnum = nnum; + } + + public String getGenKeyFk() { + return genKeyFk; + } + + public void setGenKeyFk(String genKeyFk) { + this.genKeyFk = genKeyFk; + } + + public String getsOrderId() { + return sOrderId; + } + + public void setsOrderId(String sOrderId) { + this.sOrderId = sOrderId; + } + + public String getsDetailId() { + return sDetailId; + } + + public void setsDetailId(String sDetailId) { + this.sDetailId = sDetailId; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportDetailEntity.java b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportDetailEntity.java index 677ab7b5..f1830547 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportDetailEntity.java +++ b/api-admin/src/main/java/com/glxp/api/admin/entity/thrsys/ThrOrderImportDetailEntity.java @@ -13,6 +13,7 @@ public class ThrOrderImportDetailEntity { private String corpId; private String corpName; private String billType; + private String originType; private String billFlag; private String productId; private String productName; diff --git a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java index 632e7488..a470e280 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java +++ b/api-admin/src/main/java/com/glxp/api/admin/httpclient/ErpBasicClient.java @@ -24,7 +24,7 @@ public class ErpBasicClient { public BaseResponse> getErpCrop(BasicUnitMaintainFilterRequest unitMaintainFilterRequest, String url) { Map paramMap = new HashMap<>(16); paramMap.put("name", unitMaintainFilterRequest.getName()); - paramMap.put("unitId", unitMaintainFilterRequest.getUnitId()); + paramMap.put("unitId", unitMaintainFilterRequest.getErpId()); paramMap.put("key", unitMaintainFilterRequest.getKey()); paramMap.put("page", unitMaintainFilterRequest.getPage()); paramMap.put("limit", unitMaintainFilterRequest.getLimit()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthCheckRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthCheckRequest.java new file mode 100644 index 00000000..683ff498 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/AuthCheckRequest.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.req.auth; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class AuthCheckRequest extends ListPageRequest { + + private Integer id; + private String machineInfo; + private String registerCode; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/auth/PCLoginRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/auth/PCLoginRequest.java new file mode 100644 index 00000000..0a4daad9 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/auth/PCLoginRequest.java @@ -0,0 +1,19 @@ +package com.glxp.api.admin.req.auth; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +@Data +public class PCLoginRequest { + + @NotEmpty(message = "用户名不能为空") + private String username; + + @NotEmpty(message = "密码不能为空") + private String password; + + @NotEmpty(message = "机器码不能为空") + private String machineInfo; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java index 1ae37f3e..d8d52445 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BasicUnitMaintainFilterRequest.java @@ -11,7 +11,7 @@ public class BasicUnitMaintainFilterRequest extends ListPageRequest { private Integer id; private String key; - private String unitId; + private String erpId; private String name; private String thirdSys; private String thirdSysFk; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessLocalTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessLocalTypeFilterRequest.java index 87e7acca..4269009b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessLocalTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessLocalTypeFilterRequest.java @@ -10,6 +10,5 @@ public class BussinessLocalTypeFilterRequest extends ListPageRequest { private String name; private String mainAction; private Boolean enabled; - - + private String originAction; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java new file mode 100644 index 00000000..f7a5d994 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/BussinessOriginTypeFilterRequest.java @@ -0,0 +1,10 @@ +package com.glxp.api.admin.req.basic; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +@Data +public class BussinessOriginTypeFilterRequest extends ListPageRequest { + private String action; + private String name; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.java index 25ccaf69..67435a8c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterErpGoodsRequest.java @@ -8,6 +8,7 @@ public class FilterErpGoodsRequest extends ListPageRequest { private String name; private String code; + private String unionCode; private String spec; //规格型号 private String registerNo; //注册证号 private String manufactory; //生产厂家 diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterStockprintRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterStockprintRequest.java index a3c0861e..2bf21b3f 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterStockprintRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterStockprintRequest.java @@ -17,4 +17,7 @@ public class FilterStockprintRequest extends ListPageRequest { private String spaceCode; private String thirdSysFk; private String genKeyFk; + private String sOrderId; + private String sDetailId; + private String id; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiIpLogRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiIpLogRequest.java index e64d9c61..796832bd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiIpLogRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiIpLogRequest.java @@ -12,4 +12,5 @@ public class FilterUdiIpLogRequest extends ListPageRequest { private Integer status; private String thirdSysFk; private String fromType; + private String lastUpdateTime; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/StockOrderDetailFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderDetailFilterRequest.java similarity index 81% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/StockOrderDetailFilterRequest.java rename to api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderDetailFilterRequest.java index e1ebe3b6..758326f6 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/StockOrderDetailFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderDetailFilterRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.admin.req.business; import com.glxp.api.admin.req.ListPageRequest; import lombok.Data; @@ -17,5 +17,7 @@ public class StockOrderDetailFilterRequest extends ListPageRequest { private String count; private String reCount; private String sweepCount; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/StockOrderFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java similarity index 64% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/StockOrderFilterRequest.java rename to api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java index 3479487f..a9b2aaee 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/StockOrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderFilterRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.admin.req.business; import com.glxp.api.admin.req.ListPageRequest; import lombok.Data; @@ -12,11 +12,16 @@ public class StockOrderFilterRequest extends ListPageRequest { private String corpId; private String corpName; private String billType; + private String billAction; private String billFlag; private String thirdSysFk; private String status; private String statusInfo; private String type; private String sourceType; - private String status2; + private String printStatus; + private String unitIdFk; + private String customerId; + private String startTime; //起始日期 + private String endTime; //结束日期 } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/StockOrderIdsRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderIdsRequest.java similarity index 57% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/StockOrderIdsRequest.java rename to api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderIdsRequest.java index ab8b8f7a..89d4c647 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/StockOrderIdsRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderIdsRequest.java @@ -1,5 +1,6 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.admin.req.business; +import com.glxp.api.admin.entity.basic.UdiEntity; import lombok.Data; import java.util.List; @@ -10,4 +11,5 @@ public class StockOrderIdsRequest { String id; List ids; boolean filterUDIType; + UdiEntity udiEntity; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/StockOrderPostRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java similarity index 74% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/StockOrderPostRequest.java rename to api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java index 7f2df6d9..0e763afb 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/StockOrderPostRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderPostRequest.java @@ -1,6 +1,6 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.admin.req.business; -import com.glxp.api.admin.entity.inout.StockOrderDetailEntity; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; import lombok.Data; import java.util.List; @@ -20,7 +20,8 @@ public class StockOrderPostRequest { private String statusInfo; private String type; private String sourceType; - private String status2; + private String printStatus; private List subErpOrders; + private String customerId; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/StockOrderQueryRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderQueryRequest.java similarity index 77% rename from api-admin/src/main/java/com/glxp/api/admin/req/inout/StockOrderQueryRequest.java rename to api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderQueryRequest.java index b906d537..760fb25b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/StockOrderQueryRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockOrderQueryRequest.java @@ -1,4 +1,4 @@ -package com.glxp.api.admin.req.inout; +package com.glxp.api.admin.req.business; import com.glxp.api.admin.req.ListPageRequest; import lombok.Data; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/business/StockQRCodeTextFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockQRCodeTextFilterRequest.java new file mode 100644 index 00000000..bb81e99e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/req/business/StockQRCodeTextFilterRequest.java @@ -0,0 +1,21 @@ +package com.glxp.api.admin.req.business; + +import com.glxp.api.admin.req.ListPageRequest; +import lombok.Data; + +import java.util.Date; + +@Data +public class StockQRCodeTextFilterRequest extends ListPageRequest { + + private String id; + private String orderId; + private String detailId; + private String text; + private String textTag; + private String status; + private String param; + private Date create_time; + private Date update_time; + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFModuleRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFModuleRequest.java index 72fc06d7..ea3d2e10 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFModuleRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFModuleRequest.java @@ -17,5 +17,6 @@ public class SystemPDFModuleRequest extends ListPageRequest { private int templateId; private String remark; private Date create_time; + private Integer templateType; private Date update_time; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFModuleSaveRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFModuleSaveRequest.java index caf4220d..dd2d6e44 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFModuleSaveRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFModuleSaveRequest.java @@ -15,4 +15,5 @@ public class SystemPDFModuleSaveRequest { private String remark; private Date create_time; private Date update_time; + private String templateDlUrl; } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFTemplateRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFTemplateRequest.java index 4227ee38..68099296 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFTemplateRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/info/SystemPDFTemplateRequest.java @@ -12,8 +12,8 @@ public class SystemPDFTemplateRequest extends ListPageRequest { private int id; private String name; - private int type; - private int module; + private Integer type; + private Integer module; private String param; private String path; private int rowCount; diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java index 61cd7c0f..6bc4d281 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/inout/OrderFilterRequest.java @@ -19,5 +19,5 @@ public class OrderFilterRequest extends ListPageRequest { private String endTime; private String stockCheckFk; private Integer process; - + private String unionStatus; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java index cdb65984..dfeb1ab3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java +++ b/api-admin/src/main/java/com/glxp/api/admin/req/receipt/BussinessTypeFilterRequest.java @@ -10,5 +10,5 @@ public class BussinessTypeFilterRequest extends ListPageRequest { private String name; private String mainAction; private Boolean enabled; - + private Boolean enable; } diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailQueryProductResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailQueryProductResponse.java new file mode 100644 index 00000000..f05cd548 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailQueryProductResponse.java @@ -0,0 +1,15 @@ +package com.glxp.api.admin.res.business; + +import lombok.Data; + +@Data +public class StockOrderDetailQueryProductResponse { + + private String batchNo; + private String produceDate; + private String expireDate; + private String serialNo; + private String udi; + private String getType;//1：单条，2：多条 + private String getId; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailResponse.java new file mode 100644 index 00000000..83f81463 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/res/business/StockOrderDetailResponse.java @@ -0,0 +1,23 @@ +package com.glxp.api.admin.res.business; + +import lombok.Data; + +@Data +public class StockOrderDetailResponse { + + private String id; + private String orderIdFk; + private String productId; + private String productName; + private String cpmctymc; + private String spec; + private String ggxh; + private String batchNo; + private String expireDate; + private String productDate; + private String count; + private String reCount; + private String sweepCount; + private String ylqxzcrbarmc; + private String zczbhhzbapzbh; +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFModuleResponse.java b/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFModuleResponse.java index a46398fc..17285f05 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFModuleResponse.java +++ b/api-admin/src/main/java/com/glxp/api/admin/res/info/SystemPDFModuleResponse.java @@ -15,6 +15,7 @@ public class SystemPDFModuleResponse { private String remark; private Date create_time; private Date update_time; - + private String templateDlUrl; private String templateName; + private Integer templateType; } \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthCheckService.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthCheckService.java new file mode 100644 index 00000000..b8e0a2b3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/AuthCheckService.java @@ -0,0 +1,18 @@ +package com.glxp.api.admin.service.auth; + +import com.glxp.api.admin.entity.auth.AuthCheckEntity; +import com.glxp.api.admin.req.auth.AuthCheckRequest; +import org.springframework.stereotype.Service; + +import java.util.List; + +public interface AuthCheckService { + + AuthCheckEntity findByMachine(String machineInfo); + + List filterDevices(AuthCheckRequest authCheckRequest); + + boolean insertDevices(AuthCheckEntity authCheckEntity); + + boolean updateDevices(AuthCheckEntity authCheckEntity); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthCheckServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthCheckServiceImpl.java new file mode 100644 index 00000000..b410d3be --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/auth/impl/AuthCheckServiceImpl.java @@ -0,0 +1,46 @@ +package com.glxp.api.admin.service.auth.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.auth.AuthAdminDao; +import com.glxp.api.admin.dao.auth.AuthCheckDao; +import com.glxp.api.admin.entity.auth.AuthCheckEntity; +import com.glxp.api.admin.req.auth.AuthCheckRequest; +import com.glxp.api.admin.service.auth.AuthCheckService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class AuthCheckServiceImpl implements AuthCheckService { + @Resource + private AuthCheckDao authCheckDao; + + @Override + public AuthCheckEntity findByMachine(String machineInfo) { + return authCheckDao.findByMachine(machineInfo); + } + + @Override + public List filterDevices(AuthCheckRequest authCheckRequest) { + if (authCheckRequest == null) { + return Collections.emptyList(); + } + if (authCheckRequest.getPage() != null) { + int offset = (authCheckRequest.getPage() - 1) * authCheckRequest.getLimit(); + PageHelper.offsetPage(offset, authCheckRequest.getLimit()); + } + return authCheckDao.filterDevices(authCheckRequest); + } + + @Override + public boolean insertDevices(AuthCheckEntity authCheckEntity) { + return authCheckDao.insertDevices(authCheckEntity); + } + + @Override + public boolean updateDevices(AuthCheckEntity authCheckEntity) { + return authCheckDao.updateDevices(authCheckEntity); + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java index 854f76e6..55de02b0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessLocalTypeService.java @@ -10,6 +10,7 @@ public interface BussinessLocalTypeService { List filterList(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); + List filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest); BussinessLocalTypeEntity findBTByAction(String action); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessOriginTypeService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessOriginTypeService.java new file mode 100644 index 00000000..188d875f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/BussinessOriginTypeService.java @@ -0,0 +1,13 @@ +package com.glxp.api.admin.service.basic; + + +import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity; +import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest; + +import java.util.List; + +public interface BussinessOriginTypeService { + + List filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest); + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/CustomService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/CustomService.java new file mode 100644 index 00000000..95c2d661 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/CustomService.java @@ -0,0 +1,31 @@ +package com.glxp.api.admin.service.basic; + +import com.glxp.api.admin.entity.inout.WarehouseEntity; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; + +@Service +public class CustomService { + + @Resource + UdiRelevanceService udiRelevanceService; + + public int getActCount(WarehouseEntity warehouseEntity) { + UdiRelevanceResponse udiInfoBean = udiRelevanceService.selectByNameCode(warehouseEntity.getNameCode()); + if (udiInfoBean != null) { + if (udiInfoBean.getIsUseDy() == 1 && udiInfoBean.getDiType() != 2) { + if (udiInfoBean.getBhzxxsbzsl() == 0) + return udiInfoBean.getZxxsbzbhsydysl(); + else + return udiInfoBean.getZxxsbzbhsydysl() * udiInfoBean.getBhzxxsbzsl(); + } else { + return udiInfoBean.getBhzxxsbzsl(); + } + } + + return 1; + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java index c80a8476..b148e6c3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java @@ -12,6 +12,9 @@ public interface UdiRelevanceService { List filterUdiRelevance(FilterUdiInfoRequest filterUdiInfoRequest); + + UdiRelevanceResponse selectByNameCode(String nameCode); + boolean isExit(); List filterUdiGp(FilterUdiInfoRequest filterUdiInfoRequest); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java index 6a4ca2b8..f1612f7c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessLocalTypeServiceImpl.java @@ -32,6 +32,19 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService return data; } + @Override + public List filterJoin(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest) { + if (bussinessTypeFilterRequest == null) { + return Collections.emptyList(); + } + if (bussinessTypeFilterRequest.getPage() != null) { + int offset = (bussinessTypeFilterRequest.getPage() - 1) * bussinessTypeFilterRequest.getLimit(); + PageHelper.offsetPage(offset, bussinessTypeFilterRequest.getLimit()); + } + List data = bussinessLocalTypeDao.filterJoin(bussinessTypeFilterRequest); + return data; + } + @Override public BussinessLocalTypeEntity findBTByAction(String action) { BussinessLocalTypeFilterRequest bussinessTypeFilterRequest = new BussinessLocalTypeFilterRequest(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java new file mode 100644 index 00000000..9b6aa06f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/BussinessOriginTypeServiceImpl.java @@ -0,0 +1,32 @@ +package com.glxp.api.admin.service.basic.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.basic.BussinessOriginTypeDao; +import com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity; +import com.glxp.api.admin.req.basic.BussinessOriginTypeFilterRequest; +import com.glxp.api.admin.service.basic.BussinessOriginTypeService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class BussinessOriginTypeServiceImpl implements BussinessOriginTypeService { + + @Resource + BussinessOriginTypeDao bussinessOriginTypeDao; + + @Override + public List filterList(BussinessOriginTypeFilterRequest bussinessOriginTypeFilterRequest) { + if (bussinessOriginTypeFilterRequest == null) { + return Collections.emptyList(); + } + if (bussinessOriginTypeFilterRequest.getPage() != null) { + int offset = (bussinessOriginTypeFilterRequest.getPage() - 1) * bussinessOriginTypeFilterRequest.getLimit(); + PageHelper.offsetPage(offset, bussinessOriginTypeFilterRequest.getLimit()); + } + List data = bussinessOriginTypeDao.filterList(bussinessOriginTypeFilterRequest); + return data; + } +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java index 5ade74a9..5e78b367 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java @@ -36,6 +36,16 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService { return data; } + @Override + public UdiRelevanceResponse selectByNameCode(String nameCode) { + FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); + filterUdiInfoRequest.setNameCode(nameCode); + List udiRelevanceResponses = filterUdiRelevance(filterUdiInfoRequest); + if (udiRelevanceResponses != null && udiRelevanceResponses.size() > 0) + return udiRelevanceResponses.get(0); + return null; + } + @Override public boolean isExit() { FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/StockOrderDetailService.java b/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailService.java similarity index 62% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/StockOrderDetailService.java rename to api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailService.java index 60b369a4..891ce487 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/StockOrderDetailService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailService.java @@ -1,7 +1,8 @@ -package com.glxp.api.admin.service.inout; +package com.glxp.api.admin.service.business; -import com.glxp.api.admin.entity.inout.StockOrderDetailEntity; -import com.glxp.api.admin.req.inout.StockOrderDetailFilterRequest; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.admin.res.business.StockOrderDetailResponse; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -10,6 +11,8 @@ public interface StockOrderDetailService { List filterStockOrderDetail(StockOrderDetailFilterRequest stockOrderDetailFilterRequest); + List filterStockOrderDetail2(StockOrderDetailFilterRequest stockOrderDetailFilterRequest); + boolean insertStockOrderDetail(StockOrderDetailEntity stockOrderDetailEntity); boolean insertStockOrderDetails(List stockOrderDetailEntities); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailTempService.java b/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailTempService.java new file mode 100644 index 00000000..c1a0b590 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderDetailTempService.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.service.business; + +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface StockOrderDetailTempService { + + List filterStockOrderDetailTemp(StockOrderDetailFilterRequest stockOrderDetailFilterRequest); + + boolean insertStockOrderDetailTemp(StockOrderDetailEntity stockOrderDetailEntity); + + boolean insertStockOrderDetailTemps(List stockOrderDetailEntities); + + boolean updateById(StockOrderDetailEntity stockOrderDetailEntity); + + boolean deleteById(String id); + + boolean deleteByOrderIdFk(String id); + + StockOrderDetailEntity findOne(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/StockOrderService.java b/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderService.java similarity index 66% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/StockOrderService.java rename to api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderService.java index 369994e9..7a680060 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/StockOrderService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderService.java @@ -1,9 +1,10 @@ -package com.glxp.api.admin.service.inout; +package com.glxp.api.admin.service.business; -import com.glxp.api.admin.entity.inout.StockOrderEntity; -import com.glxp.api.admin.req.inout.StockOrderFilterRequest; -import com.glxp.api.admin.req.inout.StockOrderQueryRequest; +import com.glxp.api.admin.entity.business.StockOrderEntity; +import com.glxp.api.admin.entity.business.StockOrderPrintEntity; +import com.glxp.api.admin.req.business.StockOrderFilterRequest; +import com.glxp.api.admin.req.business.StockOrderQueryRequest; import java.util.List; @@ -30,4 +31,9 @@ public interface StockOrderService { StockOrderEntity findOne(StockOrderFilterRequest stockOrderFilterRequest); StockOrderEntity findById(String orderId); + + StockOrderEntity findByBillNo(String orderId); + + + List listOrderPrint(String orderId); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/StockQRCodeTextService.java b/api-admin/src/main/java/com/glxp/api/admin/service/business/StockQRCodeTextService.java new file mode 100644 index 00000000..382885c8 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/business/StockQRCodeTextService.java @@ -0,0 +1,24 @@ +package com.glxp.api.admin.service.business; + +import com.glxp.api.admin.entity.business.StockQRCodeTextEntity; +import com.glxp.api.admin.req.business.StockQRCodeTextFilterRequest; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface StockQRCodeTextService { + + List filterStockQRCodeText(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest); + + boolean insertStockQRCodeText(StockQRCodeTextEntity stockQRCodeTextEntity); + + boolean insertStockQRCodeTexts(@Param("StockQRCodeTextEntities") List StockQRCodeTextEntitys); + + boolean updateById(StockQRCodeTextEntity stockQRCodeTextEntity); + + boolean deleteById(@Param("id") String id); + + boolean deleteByOrderId(@Param("id") String id); + + StockQRCodeTextEntity findOne(@Param("id") String id); +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/StockOrderDetailServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailServiceImpl.java similarity index 65% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/StockOrderDetailServiceImpl.java rename to api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailServiceImpl.java index 38dcee37..697fa987 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/StockOrderDetailServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailServiceImpl.java @@ -1,10 +1,11 @@ -package com.glxp.api.admin.service.inout.impl; +package com.glxp.api.admin.service.business.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inout.StockOrderDetailDao; -import com.glxp.api.admin.entity.inout.StockOrderDetailEntity; -import com.glxp.api.admin.req.inout.StockOrderDetailFilterRequest; -import com.glxp.api.admin.service.inout.StockOrderDetailService; +import com.glxp.api.admin.dao.business.StockOrderDetailDao; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.admin.res.business.StockOrderDetailResponse; +import com.glxp.api.admin.service.business.StockOrderDetailService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -29,6 +30,18 @@ public class StockOrderDetailServiceImpl implements StockOrderDetailService { return stockOrderDetailDao.filterStockOrderDetail(stockOrderDetailFilterRequest); } + @Override + public List filterStockOrderDetail2(StockOrderDetailFilterRequest stockOrderDetailFilterRequest) { + if (stockOrderDetailFilterRequest == null) { + return Collections.emptyList(); + } + if (stockOrderDetailFilterRequest.getPage() != null) { + int offset = (stockOrderDetailFilterRequest.getPage() - 1) * stockOrderDetailFilterRequest.getLimit(); + PageHelper.offsetPage(offset, stockOrderDetailFilterRequest.getLimit()); + } + return stockOrderDetailDao.filterStockOrderDetail2(stockOrderDetailFilterRequest); + } + @Override public boolean insertStockOrderDetail(StockOrderDetailEntity stockOrderDetailEntity) { return stockOrderDetailDao.insertStockOrderDetail(stockOrderDetailEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailTempServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailTempServiceImpl.java new file mode 100644 index 00000000..a619f59e --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderDetailTempServiceImpl.java @@ -0,0 +1,61 @@ +package com.glxp.api.admin.service.business.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.business.StockOrderDetailTempDao; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.admin.service.business.StockOrderDetailTempService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class StockOrderDetailTempServiceImpl implements StockOrderDetailTempService { + + @Resource + StockOrderDetailTempDao stockOrderDetailTempDao; + + @Override + public List filterStockOrderDetailTemp(StockOrderDetailFilterRequest stockOrderDetailFilterRequest) { + if (stockOrderDetailFilterRequest == null) { + return Collections.emptyList(); + } + if (stockOrderDetailFilterRequest.getPage() != null) { + int offset = (stockOrderDetailFilterRequest.getPage() - 1) * stockOrderDetailFilterRequest.getLimit(); + PageHelper.offsetPage(offset, stockOrderDetailFilterRequest.getLimit()); + } + return stockOrderDetailTempDao.filterStockOrderDetailTemp(stockOrderDetailFilterRequest); + } + + @Override + public boolean insertStockOrderDetailTemp(StockOrderDetailEntity stockOrderDetailEntity) { + return stockOrderDetailTempDao.insertStockOrderDetailTemp(stockOrderDetailEntity); + } + + @Override + public boolean insertStockOrderDetailTemps(List StockOrderDetailEntitys) { + return stockOrderDetailTempDao.insertStockOrderDetailTemps(StockOrderDetailEntitys); + } + + @Override + public boolean updateById(StockOrderDetailEntity stockOrderDetailEntity) { + return stockOrderDetailTempDao.updateById(stockOrderDetailEntity); + } + + @Override + public boolean deleteById(String id) { + return stockOrderDetailTempDao.deleteById(id); + } + @Override + public boolean deleteByOrderIdFk(String id) { + return stockOrderDetailTempDao.deleteByOrderIdFk(id); + } + + @Override + public StockOrderDetailEntity findOne(String id) { + return stockOrderDetailTempDao.findOne(id); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/StockOrderServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java similarity index 75% rename from api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/StockOrderServiceImpl.java rename to api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java index 4b99ae95..cc08c72a 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/StockOrderServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java @@ -1,11 +1,12 @@ -package com.glxp.api.admin.service.inout.impl; +package com.glxp.api.admin.service.business.impl; import com.github.pagehelper.PageHelper; -import com.glxp.api.admin.dao.inout.StockOrderDao; -import com.glxp.api.admin.entity.inout.StockOrderEntity; -import com.glxp.api.admin.req.inout.StockOrderFilterRequest; -import com.glxp.api.admin.req.inout.StockOrderQueryRequest; -import com.glxp.api.admin.service.inout.StockOrderService; +import com.glxp.api.admin.dao.business.StockOrderDao; +import com.glxp.api.admin.entity.business.StockOrderEntity; +import com.glxp.api.admin.entity.business.StockOrderPrintEntity; +import com.glxp.api.admin.req.business.StockOrderFilterRequest; +import com.glxp.api.admin.req.business.StockOrderQueryRequest; +import com.glxp.api.admin.service.business.StockOrderService; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -91,5 +92,19 @@ public class StockOrderServiceImpl implements StockOrderService { return stockOrderDao.findOne(stockOrderFilterRequest); } + @Override + public StockOrderEntity findByBillNo(String orderId) { + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); + stockOrderFilterRequest.setBillNo(orderId); + return stockOrderDao.findOne(stockOrderFilterRequest); + } + + + @Override + public List listOrderPrint(String orderId) { + StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest(); + stockOrderFilterRequest.setId(orderId); + return stockOrderDao.listOrderPrint(stockOrderFilterRequest); + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockQRCodeTextServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockQRCodeTextServiceImpl.java new file mode 100644 index 00000000..b3b6fb04 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockQRCodeTextServiceImpl.java @@ -0,0 +1,61 @@ +package com.glxp.api.admin.service.business.impl; + +import com.github.pagehelper.PageHelper; +import com.glxp.api.admin.dao.business.StockQRCodeTextDao; +import com.glxp.api.admin.entity.business.StockQRCodeTextEntity; +import com.glxp.api.admin.req.business.StockQRCodeTextFilterRequest; +import com.glxp.api.admin.service.business.StockQRCodeTextService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class StockQRCodeTextServiceImpl implements StockQRCodeTextService { + + @Resource + StockQRCodeTextDao stockQRCodeTextDao; + + @Override + public List filterStockQRCodeText(StockQRCodeTextFilterRequest stockQRCodeTextFilterRequest) { + if (stockQRCodeTextFilterRequest == null) { + return Collections.emptyList(); + } + if (stockQRCodeTextFilterRequest.getPage() != null) { + int offset = (stockQRCodeTextFilterRequest.getPage() - 1) * stockQRCodeTextFilterRequest.getLimit(); + PageHelper.offsetPage(offset, stockQRCodeTextFilterRequest.getLimit()); + } + return stockQRCodeTextDao.filterStockQRCodeText(stockQRCodeTextFilterRequest); + } + + @Override + public boolean insertStockQRCodeText(StockQRCodeTextEntity stockQRCodeTextEntity) { + return stockQRCodeTextDao.insertStockQRCodeText(stockQRCodeTextEntity); + } + + @Override + public boolean insertStockQRCodeTexts(List StockQRCodeTextEntitys) { + return stockQRCodeTextDao.insertStockQRCodeTexts(StockQRCodeTextEntitys); + } + + @Override + public boolean updateById(StockQRCodeTextEntity stockQRCodeTextEntity) { + return stockQRCodeTextDao.updateById(stockQRCodeTextEntity); + } + + @Override + public boolean deleteById(String id) { + return stockQRCodeTextDao.deleteById(id); + } + @Override + public boolean deleteByOrderId(String id) { + return stockQRCodeTextDao.deleteByOrderId(id); + } + + @Override + public StockQRCodeTextEntity findOne(String id) { + return stockQRCodeTextDao.findOne(id); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java index 4ab676b9..7fc15a5c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/InvStockPrintService.java @@ -2,6 +2,7 @@ package com.glxp.api.admin.service.inventory; import com.glxp.api.admin.entity.inventory.StockPrintEntity; import com.glxp.api.admin.req.basic.FilterStockprintRequest; + import java.util.List; public interface InvStockPrintService { @@ -10,6 +11,8 @@ public interface InvStockPrintService { StockPrintEntity findByNameCode(String nameCode); + StockPrintEntity selectById(String id); + StockPrintEntity findByRlId(FilterStockprintRequest filterStockprintRequest); boolean insertStockPrint(StockPrintEntity stockPrintEntity); @@ -22,6 +25,9 @@ public interface InvStockPrintService { boolean deleteByGenKey(String genKey); + boolean deleteByOrderId(String sOrderId); + + boolean updatePrintStatus(List ids); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java index 111fa858..52937594 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/inventory/impl/InvStockPrintServiceImpl.java @@ -35,6 +35,17 @@ public class InvStockPrintServiceImpl implements InvStockPrintService { return stockPrintDao.findByNameCode(prefix); } + @Override + public StockPrintEntity selectById(String id) { + FilterStockprintRequest filterStockprintRequest = new FilterStockprintRequest(); + filterStockprintRequest.setId(id); + List stockPrintEntitys = stockPrintDao.filterStockPrint(filterStockprintRequest); + if (stockPrintEntitys != null && stockPrintEntitys.size() > 0) { + return stockPrintEntitys.get(0); + } + return null; + } + @Override public StockPrintEntity findByRlId(FilterStockprintRequest udiRlIdFk) { return stockPrintDao.findByRlId(udiRlIdFk); @@ -65,6 +76,11 @@ public class InvStockPrintServiceImpl implements InvStockPrintService { return stockPrintDao.deleteByGenKey(genKey); } + @Override + public boolean deleteByOrderId(String sOrderId) { + return stockPrintDao.deleteByOrderId(sOrderId); + } + @Override public boolean updatePrintStatus(List ids) { return stockPrintDao.updatePrintStatus(ids); diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpService.java index 0a3a691c..f4bf52f3 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrCorpService.java @@ -17,5 +17,7 @@ public interface ThrCorpService { boolean deleteById(String id); + boolean deleteByUnitId(String id); + boolean deleteAll(); } diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java index 73114eb2..4e14be44 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrDataService.java @@ -1,24 +1,21 @@ package com.glxp.api.admin.service.thrsys; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.StockOrderDetailEntity; -import com.glxp.api.admin.entity.inout.StockOrderEntity; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.business.StockOrderEntity; import com.glxp.api.admin.entity.thrsys.ThrProductsEntity; import com.glxp.api.admin.httpclient.ErpBasicClient; import com.glxp.api.admin.req.basic.FilterErpGoodsRequest; -import com.glxp.api.admin.req.inout.StockOrderDetailFilterRequest; -import com.glxp.api.admin.req.inout.StockOrderFilterRequest; +import com.glxp.api.admin.req.business.StockOrderDetailFilterRequest; +import com.glxp.api.admin.req.business.StockOrderFilterRequest; import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpProductsResponse; import com.glxp.api.admin.res.inout.ErpOrderResponse; import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; -import com.glxp.api.admin.service.basic.BasicThirdSysService; -import com.glxp.api.admin.service.inout.StockOrderDetailService; -import com.glxp.api.admin.service.inout.StockOrderService; -import com.glxp.api.admin.thread.IoModifyErpTask; +import com.glxp.api.admin.service.business.StockOrderDetailService; +import com.glxp.api.admin.service.business.StockOrderService; import com.glxp.api.common.res.BaseResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpServiceImpl.java b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpServiceImpl.java index 92840a2e..d0e5d271 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpServiceImpl.java +++ b/api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrCorpServiceImpl.java @@ -50,6 +50,11 @@ public class ThrCorpServiceImpl implements ThrCorpService { return thrCorpDao.deleteById(id); } + @Override + public boolean deleteByUnitId(String id) { + return thrCorpDao.deleteByUnitId(id); + } + @Override public boolean deleteAll() { return thrCorpDao.deleteAll(); 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 da19bcea..9e137073 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,6 +1,7 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.constant.ConstantStatus; +import com.glxp.api.admin.entity.basic.BasicThirdSysEntity; import com.glxp.api.admin.entity.basic.UdiInfoEntity; import com.glxp.api.admin.entity.basic.UdiRelevanceEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; @@ -13,6 +14,7 @@ import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.basic.ErpProductsResponse; import com.glxp.api.admin.res.inventory.ErpInvProductResponse; +import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.basic.UdiInfoService; import com.glxp.api.admin.service.basic.UdiRelevanceService; import com.glxp.api.admin.service.info.SystemParamConfigService; @@ -41,7 +43,8 @@ public class BasicBackUpdateProductService { ThrProductsService thrProductsService; @Resource SystemParamConfigService systemParamConfigService; - + @Resource + BasicThirdSysService basicThirdSysService; //定时或一键下载更新全部线上产品信息 @Async @@ -106,6 +109,25 @@ public class BasicBackUpdateProductService { udiRelevanceEntity1.setThirdId4(invmandocResponse.getCode()); udiRelevanceEntity1.setThirdName4(invmandocResponse.getName()); } + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + String mainSys = basicThirdSysEntity.getThirdId(); + if (mainSys.equals("thirdId")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName()); + } else if (mainSys.equals("thirdId1")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId1()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName1()); + } else if (mainSys.equals("thirdId2")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId2()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName2()); + } else if (mainSys.equals("thirdId3")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId3()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName3()); + } else if (mainSys.equals("thirdId4")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName4()); + } + udiRelevanceEntity1.setThirdId(invmandocResponse.getCode()); udiRelevanceEntity1.setThirdName(invmandocResponse.getName()); udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); @@ -210,7 +232,24 @@ public class BasicBackUpdateProductService { udiRelevanceEntity1.setThirdId4(thrProductsEntity.getCode()); udiRelevanceEntity1.setThirdName4(thrProductsEntity.getName()); } - + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + String mainSys = basicThirdSysEntity.getThirdId(); + if (mainSys.equals("thirdId")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName()); + } else if (mainSys.equals("thirdId1")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId1()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName1()); + } else if (mainSys.equals("thirdId2")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId2()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName2()); + } else if (mainSys.equals("thirdId3")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId3()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName3()); + } else if (mainSys.equals("thirdId4")) { + udiRelevanceEntity1.setMainId(udiRelevanceEntity1.getThirdId4()); + udiRelevanceEntity1.setMainName(udiRelevanceEntity1.getThirdName4()); + } udiRelevanceEntity1.setThirdId(thrProductsEntity.getCode()); udiRelevanceEntity1.setThirdName(thrProductsEntity.getName()); udiRelevanceEntity1.setUpdateTime(DateUtil.getDateTime()); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicCorpImportService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicCorpImportService.java index 2ee19ba4..e9908f7c 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicCorpImportService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicCorpImportService.java @@ -4,6 +4,7 @@ import com.glxp.api.admin.constant.BasicProcessStatus; import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.api.admin.entity.basic.CorpImportDetailEntity; import com.glxp.api.admin.entity.basic.CorpImportLogEntity; +import com.glxp.api.admin.req.basic.BasicUnitMaintainFilterRequest; import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; import com.glxp.api.admin.service.basic.BasicUnitMaintainService; import com.glxp.api.admin.service.basic.CorpImportDetailService; @@ -29,7 +30,7 @@ public class BasicCorpImportService { public void importCorps(String genKey) { CorpImportLogEntity corpImportLogEntity = corpImportLogService.selectByGenKey(genKey); - if(corpImportLogEntity!=null && corpImportLogEntity.getStatus() == BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS){ + if (corpImportLogEntity != null && corpImportLogEntity.getStatus() == BasicProcessStatus.UDIINFO_IMPORT_UNPROCESS) { FilterUdiIpLogRequest filterUdiIpLogRequest = new FilterUdiIpLogRequest(); filterUdiIpLogRequest.setGenKey(genKey); List corpImportDetailEntities @@ -38,9 +39,18 @@ public class BasicCorpImportService { for (CorpImportDetailEntity corpImportDetailEntity : corpImportDetailEntities) { BasicUnitMaintainEntity basicUnitMaintainEntity = new BasicUnitMaintainEntity(); BeanUtils.copyProperties(corpImportDetailEntity, basicUnitMaintainEntity); - basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); - corpImportDetailEntity.setImportStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_SUCESS); + BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest = new BasicUnitMaintainFilterRequest(); + BeanUtils.copyProperties(corpImportDetailEntity, basicUnitMaintainFilterRequest); + List basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); + if (basicUnitMaintainEntities != null && basicUnitMaintainEntities.size() > 0) { + basicUnitMaintainService.insertBasicUnitMaintain(basicUnitMaintainEntity); + corpImportDetailEntity.setImportStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_SUCESS); + } else { + corpImportDetailEntity.setImportStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_FAIL); + corpImportDetailEntity.setRemark("重复导入！"); + } corpImportDetailService.updateCorpImport(corpImportDetailEntity); + } } corpImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); @@ -48,8 +58,6 @@ public class BasicCorpImportService { } - - } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.java index cbf3fa2e..f0de2e7b 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicGenExcelService.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.req.basic.*; @@ -146,21 +147,21 @@ public class BasicGenExcelService { //todo 上传SMP SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip"); - if(systemParamConfigEntity!=null){ - String response = HttpClient.uCloudPost(systemParamConfigEntity.getParamValue()+"/udiwms/basic/corps/upload", postCorpsRequest); - BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() {}); + if (systemParamConfigEntity != null) { + String response = HttpClient.uCloudPost(systemParamConfigEntity.getParamValue() + "/udiwms/basic/corps/upload", postCorpsRequest); + BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { + }); if (baseResponse.getCode() == 20000) { corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); } else { corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); } - }else { + } else { corpExportLogEntity.setRemark("SMP服务IP地址未定义！"); corpExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); } - corpExportLogService.updateCorpExportLog(corpExportLogEntity); } @@ -177,6 +178,7 @@ public class BasicGenExcelService { head.add("thirdId2"); head.add("thirdId3"); head.add("thirdId4"); + head.add("是否以使用单元入库"); excelData.add(head); //选中导出 if (udiInfoExportRequest.getUuids() != null && udiInfoExportRequest.getUuids().size() > 0) { @@ -223,13 +225,15 @@ public class BasicGenExcelService { postUdiInfoRequest.setGenKey(genKey); //选中导出 if (udiInfoExportRequest.getUuids() != null && udiInfoExportRequest.getUuids().size() > 0) { + List udiInfoImportDetailEntities = new ArrayList<>(); List uuids = udiInfoExportRequest.getUuids(); for (String uuid : uuids) { FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); filterUdiInfoRequest.setUuid(uuid); List genDatas = genSmpData(filterUdiInfoRequest); - postUdiInfoRequest.setDatas(genDatas); + udiInfoImportDetailEntities.addAll(genDatas); } + postUdiInfoRequest.setDatas(udiInfoImportDetailEntities); } else {//一键导出 FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest(); @@ -239,15 +243,17 @@ public class BasicGenExcelService { } //todo 上传SMP SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("smp_service_ip"); - if(systemParamConfigEntity!=null){ - String response = HttpClient.uCloudPost(systemParamConfigEntity.getParamValue()+"/udiwms/basic/products/upload", postUdiInfoRequest); - BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() {}); + if (systemParamConfigEntity != null) { + String response = HttpClient.uCloudPost(systemParamConfigEntity.getParamValue() + "/udiwms/basic/products/upload", postUdiInfoRequest); + BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference() { + }); if (baseResponse.getCode() == 20000) { udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); } else { + udiInfoExportLogEntity.setRemark(baseResponse.getMessage()); udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); } - }else { + } else { udiInfoExportLogEntity.setRemark("SMP服务IP地址未定义！"); udiInfoExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); } @@ -290,7 +296,10 @@ public class BasicGenExcelService { List udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest); for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) { List rows = new ArrayList<>(); - rows.add(udiRelevanceResponse.getNameCode()); + if (udiRelevanceResponse.getProductType() == ConstantStatus.PRODUCT_TYPE_THIRD) + rows.add(null); + else + rows.add(udiRelevanceResponse.getNameCode()); rows.add(udiRelevanceResponse.getYbbm()); rows.add(udiRelevanceResponse.getSptm()); rows.add(udiRelevanceResponse.getThirdId()); @@ -298,6 +307,11 @@ public class BasicGenExcelService { rows.add(udiRelevanceResponse.getThirdId2()); rows.add(udiRelevanceResponse.getThirdId3()); rows.add(udiRelevanceResponse.getThirdId4()); + if (udiRelevanceResponse.getIsUseDy() == 1) { + rows.add("是"); + } else { + rows.add("否"); + } excelData.add(rows); } return excelData; @@ -316,6 +330,11 @@ public class BasicGenExcelService { udiInfoImportDetailEntity.setThirdId2(udiRelevanceResponse.getThirdId2()); udiInfoImportDetailEntity.setThirdId3(udiRelevanceResponse.getThirdId3()); udiInfoImportDetailEntity.setThirdId4(udiRelevanceResponse.getThirdId4()); + if (udiRelevanceResponse.getIsUseDy() == 1) { + udiInfoImportDetailEntity.setIsUseDy("是"); + } else { + udiInfoImportDetailEntity.setIsUseDy("否"); + } udiInfoImportDetailEntities.add(udiInfoImportDetailEntity); } return udiInfoImportDetailEntities; 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 2ffb4d6e..db3d484b 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 @@ -59,11 +59,31 @@ public class BasicUdiInfoImportService { filterUdiIpLogRequest.setGenKey(genKey); List udiInfoImportEntities = udiInfoImportService.filterUdiInfoImport(filterUdiIpLogRequest); - if (udiInfoImportEntities != null) { + if (udiInfoImportEntities != null && udiInfoImportEntities.size() > 0) { for (UdiInfoImportDetailEntity udiInfoImportDetailEntity : udiInfoImportEntities) { UdiInfoEntity udiInfoEntity = null; + + //判断更新 + BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); + String mainSys = basicThirdSysEntity.getThirdId(); + String mainId = null; + if (mainSys.equals("thirdId")) { + mainId = udiInfoImportDetailEntity.getThirdId(); + } else if (mainSys.equals("thirdId1")) { + mainId = udiInfoImportDetailEntity.getThirdId1(); + } else if (mainSys.equals("thirdId2")) { + mainId = udiInfoImportDetailEntity.getThirdId2(); + } else if (mainSys.equals("thirdId3")) { + mainId = udiInfoImportDetailEntity.getThirdId3(); + } else if (mainSys.equals("thirdId4")) { + mainId = udiInfoImportDetailEntity.getThirdId4(); + } + //国家库获取取UDI信息 - if (udiInfoImportDetailEntity.getUdiCode() != null && !udiInfoImportDetailEntity.getUdiCode().trim().isEmpty()) { + if (udiInfoImportDetailEntity.getUdiCode() != null + && !udiInfoImportDetailEntity.getUdiCode().trim().isEmpty() + && !udiInfoImportDetailEntity.getUdiCode().equals(mainId) + ) { udiInfoEntity = udiInfoService.findByNameCode(udiInfoImportDetailEntity.getUdiCode()); List froms = null; if (udiInfoEntity == null) { @@ -81,21 +101,7 @@ public class BasicUdiInfoImportService { if (froms != null) udiInfoService.insertUdiInfos(froms); } - //判断更新 - BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys(); - String mainSys = basicThirdSysEntity.getThirdId(); - String mainId = null; - if (mainSys.equals("thirdId")) { - mainId = udiInfoImportDetailEntity.getThirdId(); - } else if (mainSys.equals("thirdId1")) { - mainId = udiInfoImportDetailEntity.getThirdId1(); - } else if (mainSys.equals("thirdId2")) { - mainId = udiInfoImportDetailEntity.getThirdId2(); - } else if (mainSys.equals("thirdId3")) { - mainId = udiInfoImportDetailEntity.getThirdId3(); - } else if (mainSys.equals("thirdId4")) { - mainId = udiInfoImportDetailEntity.getThirdId4(); - } + UdiRelevanceEntity udiRelevanceEntity = null; if (udiInfoEntity == null) { udiRelevanceEntity = udiRelevanceService.selectUpdateByThirdId(mainId); //更新 @@ -130,7 +136,7 @@ public class BasicUdiInfoImportService { udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); } } else { - if (mainId == null) {//只存在UDI + if (mainId == null || "".equals(mainId)) {//只存在UDI UdiRelevanceEntity temp = udiRelevanceService.selectUpdateByUuid(udiInfoEntity.getUuid()); if (temp != null && (temp.getThirdId() != null || temp.getThirdId1() != null || temp.getThirdId2() != null || @@ -139,6 +145,12 @@ public class BasicUdiInfoImportService { udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); updateValue(udiRelevanceEntity, udiInfoImportDetailEntity, udiInfoImportLogEntity, mainId); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); + } else if (temp == null) { + temp = new UdiRelevanceEntity(); + temp.setUuid(udiInfoEntity.getUuid()); + udiInfoImportDetailEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_SUCESS); + temp.setUpdateTime(DateUtil.formatDateTime(new Date())); + udiRelevanceService.insertUdiRelevance(temp); } else { udiInfoImportDetailEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_FAIL); udiInfoImportDetailEntity.setRemark("UDI已存在并且未关联不能重复插入！"); @@ -151,22 +163,22 @@ public class BasicUdiInfoImportService { udiRelevanceService.updateUdiRelevance(temp); } else { UdiRelevanceEntity mTemp = udiRelevanceService.selectUpdateByThirdId(mainId); - if(mTemp!=null){ + if (mTemp != null) { udiInfoImportDetailEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_FAIL); udiInfoImportDetailEntity.setRemark("产品编码已存在关联不能重复插入！"); udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); - }else { + } else { UdiRelevanceEntity mTemp2 = udiRelevanceService.selectUpdateByUuid(udiInfoEntity.getUuid()); - if(mTemp2!=null && (mTemp2.getThirdId() != null || mTemp2.getThirdId1() != null || mTemp2.getThirdId2() != null || - mTemp2.getThirdId3() != null || mTemp2.getThirdId4() != null)){ + if (mTemp2 != null && (mTemp2.getThirdId() != null || mTemp2.getThirdId1() != null || mTemp2.getThirdId2() != null || + mTemp2.getThirdId3() != null || mTemp2.getThirdId4() != null)) { udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); - updateValue(udiRelevanceEntity,udiInfoImportDetailEntity,udiInfoImportLogEntity,mainId); + updateValue(udiRelevanceEntity, udiInfoImportDetailEntity, udiInfoImportLogEntity, mainId); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); - }else { + } else { udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setUuid(udiInfoEntity.getUuid()); - updateValue(udiRelevanceEntity,udiInfoImportDetailEntity,udiInfoImportLogEntity,mainId); + updateValue(udiRelevanceEntity, udiInfoImportDetailEntity, udiInfoImportLogEntity, mainId); udiRelevanceService.insertUdiRelevance(udiRelevanceEntity); } @@ -176,14 +188,16 @@ public class BasicUdiInfoImportService { } } - - //字段更新 udiInfoImportService.updateUdiInfoImport(udiInfoImportDetailEntity); } + udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); + udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity); + } else { + udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); + udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity); } - udiInfoImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); - udiInfoImportLogService.updateImportLog(udiInfoImportLogEntity); + } } @@ -197,7 +211,14 @@ public class BasicUdiInfoImportService { if (udiInfoImportDetailEntity.getSptm() != null && !udiInfoImportDetailEntity.getSptm().trim().equals("")) { udiRelevanceEntity.setSptm(udiInfoImportDetailEntity.getSptm()); } + if (udiInfoImportDetailEntity.getIsUseDy() != null && udiInfoImportDetailEntity.getIsUseDy().trim().equals("")) { + if (udiInfoImportDetailEntity.getIsUseDy().equals("是")) { + udiRelevanceEntity.setIsUseDy(true); + } else { + udiRelevanceEntity.setIsUseDy(false); + } + } if (udiInfoImportDetailEntity.getThirdId() != null && !udiInfoImportDetailEntity.getThirdId().trim().equals("")) { ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiInfoImportDetailEntity.getThirdId(), "thirdId"); if (thrProductsEntity != null) { @@ -299,11 +320,10 @@ public class BasicUdiInfoImportService { //下载供应商产品信息， @Async - public void downloadSmpUdiInfo(String genKey) { + public void downloadSmpUdiInfo(String genKey, String lastUpdateTime) { int page = 1; int limit = 100; - String lastUpdateTime = DateUtil.formatDateTime(new Date()); while (true) { List udiRelevanceResponses = getUdiInfo(page, limit, lastUpdateTime); @@ -313,10 +333,15 @@ public class BasicUdiInfoImportService { UdiInfoImportDetailEntity udiInfoImportEntity = new UdiInfoImportDetailEntity(); udiInfoImportEntity.setUdiCode(udiRelevanceResponse.getNameCode()); BeanUtils.copyProperties(udiRelevanceResponse, udiInfoImportEntity); - udiInfoImportEntity.setThirdId(udiRelevanceResponse.getErpId()); udiInfoImportEntity.setUpdateTime(new Date()); udiInfoImportEntity.setGenKeyFk(genKey); + if (udiRelevanceResponse.getIsUseDy() == 1) { + udiInfoImportEntity.setIsUseDy("是"); + } else { + udiInfoImportEntity.setIsUseDy("否"); + } udiInfoImportService.insertUdiInfoImport(udiInfoImportEntity); + } if (udiRelevanceResponses.size() >= 100) { page++; @@ -339,8 +364,9 @@ public class BasicUdiInfoImportService { } Map paramMap = new HashMap<>(16); - paramMap.put("page", 1); - paramMap.put("limit", 100); + paramMap.put("page", page); + paramMap.put("limit", limit); + paramMap.put("dataType", "2");//数据类型为供应商平台上传 paramMap.put("lastUpdateTime", lastUpdateTime); String response = HttpClient.mipsGet(smpUrl + "/udiwms/basic/products/download", paramMap); try { diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUnitImportService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUnitImportService.java index e7d6ef55..f86358a0 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUnitImportService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/BasicUnitImportService.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.thread; +import cn.hutool.extra.pinyin.PinyinUtil; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; import com.glxp.api.admin.entity.thrsys.ThrCorpEntity; @@ -19,6 +20,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; +import java.util.Locale; import java.util.stream.Collectors; @Service @@ -30,7 +32,7 @@ public class BasicUnitImportService { @Async - public void selectAllUnit(BasicThirdSysDetailEntity basicThirdSysDetailEntity, BasicUnitMaintainFilterRequest unitMaintainFilterRequest){ + public void selectAllUnit(BasicThirdSysDetailEntity basicThirdSysDetailEntity, BasicUnitMaintainFilterRequest unitMaintainFilterRequest) { List imports = new ArrayList<>(); if (basicThirdSysDetailEntity.getFromType() == 0) { int page = 1; @@ -63,6 +65,7 @@ public class BasicUnitImportService { item -> { ErpUnitsResponse thrProductsEntity = new ErpUnitsResponse(); BeanUtils.copyProperties(item, thrProductsEntity); + thrProductsEntity.setId(item.getUnitId()); return thrProductsEntity; } ).collect(Collectors.toList()); @@ -91,7 +94,11 @@ public class BasicUnitImportService { } basicUnitMaintainEntity.setErpId(CustomUtil.getId()); basicUnitMaintainEntity.setName(erpUnitsResponse.getName()); - basicUnitMaintainEntity.setSpell(erpUnitsResponse.getSpell()); + if (erpUnitsResponse.getSpell() == null || "".equals(erpUnitsResponse.getSpell())) { + basicUnitMaintainEntity.setSpell(PinyinUtil.getFirstLetter(erpUnitsResponse.getName(), "").toUpperCase(Locale.ROOT)); + } else { + basicUnitMaintainEntity.setSpell(erpUnitsResponse.getSpell()); + } basicUnitMaintainEntity.setAddr(erpUnitsResponse.getAddr()); basicUnitMaintainEntity.setCreditNo(erpUnitsResponse.getCreditNo()); basicUnitMaintainEntity.setContact(erpUnitsResponse.getContact()); 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 3a923c5c..87f5e4f9 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 @@ -368,7 +368,7 @@ public class BasicUpdateProductService { paramMap.put("zczbhhzbapzbh", productInfoFilterRequest.getZczbhhzbapzbh()); paramMap.put("uuid", productInfoFilterRequest.getUuid()); - String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterUdi", paramMap); + String response = HttpClient.mipsGet(udiUrl + "/udidl/device/filterAllUdi", paramMap); try { BaseResponse> udiDlDeviceResponse = diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java index beae6a95..49edb7b9 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/IoTransInoutService.java @@ -3,9 +3,7 @@ package com.glxp.api.admin.thread; import com.glxp.api.admin.config.WebSocketServer; import com.glxp.api.admin.constant.ConstantStatus; import com.glxp.api.admin.controller.inout.utils.DataTransUtil; -import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; -import com.glxp.api.admin.entity.basic.BussinessTypeEntity; -import com.glxp.api.admin.entity.basic.UdiEntity; +import com.glxp.api.admin.entity.basic.*; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.httpclient.ErpOrderClient; import com.glxp.api.admin.controller.inout.utils.ContrastErpUtil; @@ -18,6 +16,7 @@ import com.glxp.api.admin.req.inout.OrderFilterRequest; import com.glxp.api.admin.req.inout.PostOrderRequest; import com.glxp.api.admin.req.inout.WarehouseQueryRequest; import com.glxp.api.admin.res.basic.BussinessTypResponse; +import com.glxp.api.admin.res.basic.UdiRelevanceResponse; import com.glxp.api.admin.service.basic.BasicThirdSysService; import com.glxp.api.admin.service.basic.BussinessTypeService; import com.glxp.api.admin.service.basic.UdiInfoService; @@ -71,6 +70,8 @@ public class IoTransInoutService { ThrDataService thrDataService; @Resource InvProductsTrService invProductsTrService; + @Resource + InoutUtils inoutUtils; //生成订单，插入零时表 @Async @@ -208,8 +209,9 @@ public class IoTransInoutService { for (int j = 0; j < filterList.size(); j++) { WarehouseEntity warehouseEntity = filterList.get(j); - String result = new InoutUtils().filterCode(warehouseService, warehouseEntity, systemParamConfigService); + String result = inoutUtils.filterCode(warehouseService, warehouseEntity, systemParamConfigService); if (result == null) { + //计算扫码数量 insertList.add(warehouseEntity); } else { orderService.updateOrderStatus(warehouseEntity.getOrderId(), ConstantStatus.ORDER_STATUS_FAIL); @@ -224,13 +226,20 @@ public class IoTransInoutService { WarehouseQueryRequest tempQuery = new WarehouseQueryRequest(); tempQuery.setOrderId(orderEntity.getId()); List temps = codesTempService.findByOrderId(tempQuery); + + String action = orderEntity.getAction(); if (orderEntity.getErpFk() != null && !"".equals(orderEntity.getErpFk())) { orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK); } else { //因为只需用到条码，所以不需要重新读取 - new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, insertList); - orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_SUCCESS); - invProductsTrService.genInvProducts(orderEntity.getId()); + inoutUtils.generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, insertList); + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction()); + if (bussinessTypeEntity.getThirdSysFk() == null && bussinessTypeEntity.getLocalAction() == null) { + orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_SUCCESS); + invProductsTrService.genInvProducts(orderEntity.getId()); + } else { + orderService.updateOrderStatus(orderEntity.getId(), ConstantStatus.ORDER_STATUS_CHECK); + } } List ids = new ArrayList<>(); @@ -310,7 +319,7 @@ public class IoTransInoutService { orderEntity.setRemark("第三方出入库单据未启用"); orderService.updateOrder(orderEntity); myErpOrderService.deleteByOrderId(orderEntity.getId()); - new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData); + inoutUtils.generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData); } @@ -320,7 +329,7 @@ public class IoTransInoutService { orderEntity.setRemark("未选入第三方出入库单据进行校验，请手动选择"); orderService.updateOrder(orderEntity); myErpOrderService.deleteByOrderId(orderEntity.getId()); - new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData); + inoutUtils.generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData); } } @@ -340,14 +349,14 @@ public class IoTransInoutService { } myErpOrderService.deleteByOrderId(orderEntity.getId()); myErpOrderService.insertErpOrders(returnOrders); - new ContrastErpUtil(udiUrl).contrastErp(udiInfoService, udiRelevanceService, myErpOrderService, orderService, transData, systemParamConfigService,bussinessTypeEntity); + new ContrastErpUtil(udiUrl).contrastErp(udiInfoService, udiRelevanceService, myErpOrderService, orderService, transData, systemParamConfigService, bussinessTypeEntity); } else { orderEntity.setContrastStatus(ConstantStatus.ORDER_CHECK_FAIL); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_SUCCESS); orderEntity.setRemark("获取ERP出入库单据失败"); orderService.updateOrder(orderEntity); myErpOrderService.deleteByOrderId(orderEntity.getId()); - new InoutUtils(udiUrl).generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData); + inoutUtils.generateConstrastDetail(udiInfoService, udiRelevanceService, myErpOrderService, transData); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/TaskExecutorConfig.java b/api-admin/src/main/java/com/glxp/api/admin/thread/TaskExecutorConfig.java index 6b0729e1..b6974791 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/TaskExecutorConfig.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/TaskExecutorConfig.java @@ -31,10 +31,10 @@ public class TaskExecutorConfig implements AsyncConfigurer { return threadPool; } - public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { - - return new MyAsyncExceptionHandler(); - } +// public AsyncUncaughtExceptionHandler getAsyncUncaughtExceptionHandler() { +// +// return new MyAsyncExceptionHandler(); +// } /** * 自定义异常处理类 diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java index 4bb15c5e..50bfe687 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrCorpsDlService.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.thread; +import cn.hutool.extra.pinyin.PinyinUtil; import com.glxp.api.admin.config.WebSocketServer; import com.glxp.api.admin.constant.BasicProcessStatus; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; @@ -296,7 +297,7 @@ public class ThrCorpsDlService { public List getCorps(int page, int limit, String corpUrl, ThrCorpExportRequest thrCorpExportRequest) { BasicUnitMaintainFilterRequest basicUnitMaintainFilterRequest = new BasicUnitMaintainFilterRequest(); basicUnitMaintainFilterRequest.setName(thrCorpExportRequest.getName()); - basicUnitMaintainFilterRequest.setUnitId(thrCorpExportRequest.getUnitId()); + basicUnitMaintainFilterRequest.setErpId(thrCorpExportRequest.getUnitId()); basicUnitMaintainFilterRequest.setPage(page); basicUnitMaintainFilterRequest.setLimit(limit); BaseResponse> erpCrops = new ErpBasicClient().getErpCrop(basicUnitMaintainFilterRequest, corpUrl); diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java index 08dd7123..edf48637 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrOrdersDlService.java @@ -5,11 +5,14 @@ import com.alibaba.fastjson.TypeReference; import com.glxp.api.admin.config.WebSocketServer; import com.glxp.api.admin.constant.BasicProcessStatus; import com.glxp.api.admin.entity.basic.BasicThirdSysDetailEntity; +import com.glxp.api.admin.entity.basic.BasicUnitMaintainEntity; +import com.glxp.api.admin.entity.basic.BussinessTypeEntity; import com.glxp.api.admin.entity.info.SystemParamConfigEntity; import com.glxp.api.admin.entity.thrsys.*; import com.glxp.api.admin.httpclient.ErpOrderClient; import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest; import com.glxp.api.admin.req.inout.FilterOrderRequest; +import com.glxp.api.admin.req.receipt.BussinessTypeFilterRequest; import com.glxp.api.admin.req.thrsys.FilterThrOrderDetailRequest; import com.glxp.api.admin.req.thrsys.FilterThrOrderRequest; import com.glxp.api.admin.req.thrsys.PostThrOrderRequest; @@ -17,6 +20,7 @@ import com.glxp.api.admin.req.thrsys.ThrOrderExportRequest; import com.glxp.api.admin.res.PageSimpleResponse; import com.glxp.api.admin.res.inout.ErpOrderResponse; import com.glxp.api.admin.service.basic.BasicThirdSysDetailService; +import com.glxp.api.admin.service.basic.BasicUnitMaintainService; import com.glxp.api.admin.service.basic.BussinessTypeService; import com.glxp.api.admin.service.info.SystemParamConfigService; import com.glxp.api.admin.service.thrsys.*; @@ -56,6 +60,8 @@ public class ThrOrdersDlService { ThrOrderImportService thrOrderImportService; @Resource SystemParamConfigService systemParamConfigService; + @Resource + BasicUnitMaintainService basicUnitMaintainService; @Async @@ -88,11 +94,11 @@ public class ThrOrdersDlService { ThrOrderImportLogEntity thrOrderImportLogEntity = thrOrderImportLogService.selectByGenKey(genKey); if (erpOrderResponses != null && erpOrderResponses.size() > 0) { for (ErpOrderResponse erpOrderResponse : erpOrderResponses) { - ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); - BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity); - thrOrderEntity.setThirdSysFk(thirdSys); - thrOrderEntity.setUpdateTime(new Date()); - thrOrderService.insertThrOrder(thrOrderEntity); +// ThrOrderEntity thrOrderEntity = new ThrOrderEntity(); +// BeanUtils.copyProperties(erpOrderResponse, thrOrderEntity); +// thrOrderEntity.setThirdSysFk(thirdSys); +// thrOrderEntity.setUpdateTime(new Date()); +// thrOrderService.insertThrOrder(thrOrderEntity); List thrOrderDetailEntities = new ArrayList<>(); for (ErpOrderResponse.SubErpOrder subPurchase : erpOrderResponse.getSubErpOrders()) { ThrOrderImportDetailEntity thrOrderDetailEntity = new ThrOrderImportDetailEntity(); @@ -133,9 +139,15 @@ public class ThrOrdersDlService { head.add("失效日期"); head.add("订单数量"); head.add("实际数量"); + head.add("原单据类型"); excelData.add(head); + BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(thrOrderExportRequest.getBillAction()); + //选中导出 if (thrOrderExportRequest.getErpOrderResponses() != null && thrOrderExportRequest.getErpOrderResponses().size() > 0) { + BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); + bussinessTypeFilterRequest.setEnabled(true); + List bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest); List erpOrderResponses = thrOrderExportRequest.getErpOrderResponses(); for (ErpOrderResponse erpOrderResponse : erpOrderResponses) { List subErpOrders = erpOrderResponse.getSubErpOrders(); @@ -143,9 +155,14 @@ public class ThrOrdersDlService { List rows = new ArrayList<>(); rows.add(erpOrderResponse.getBillNo()); rows.add(erpOrderResponse.getBilldate()); +// BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(erpOrderResponse.getCorpId(), bussinessTypeEntity.getThirdSysFk()); +// if (basicUnitMaintainEntity != null) +// rows.add(basicUnitMaintainEntity.getErpId()); +// else rows.add(erpOrderResponse.getCorpId()); + rows.add(erpOrderResponse.getCorpName()); - rows.add(erpOrderResponse.getBillType()); + rows.add(getName(bussinessTypeEntities, erpOrderResponse.getBillType())); rows.add(erpOrderResponse.getBillFlag()); rows.add(subErpOrder.getProductId()); rows.add(subErpOrder.getProductName()); @@ -155,6 +172,7 @@ public class ThrOrdersDlService { rows.add(subErpOrder.getExpireDate()); rows.add(subErpOrder.getCount() + ""); rows.add(subErpOrder.getReCount() + ""); + rows.add(erpOrderResponse.getOriginType()); excelData.add(rows); } @@ -162,22 +180,25 @@ public class ThrOrdersDlService { } else {//一键导出 - BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("orderQueryUrl", thrOrderExportRequest.getThirdSysFk()); - if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) { + BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("orderQueryUrl", bussinessTypeEntity.getThirdSysFk()); + + if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); - thrOrderExportLogEntity.setRemark("第三方业务单据服务未启用"); + thrOrderExportLogEntity.setRemark("业务单据接口地址未定义"); thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); return; } - if (basicThirdSysDetailEntity == null || basicThirdSysDetailEntity.getValue() == null) { + if (!basicThirdSysDetailEntity.getEnabled() || basicThirdSysDetailEntity.getThirdSysFk() == null) { thrOrderExportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_FAIL); - thrOrderExportLogEntity.setRemark("业务单据接口地址未定义"); + thrOrderExportLogEntity.setRemark("第三方业务单据服务未启用"); thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); return; } + if (basicThirdSysDetailEntity.getFromType() == 0) { FilterThrOrderRequest filterThrOrderRequest = new FilterThrOrderRequest(); + filterThrOrderRequest.setThirdSysFk(bussinessTypeEntity.getThirdSysFk()); BeanUtils.copyProperties(thrOrderExportRequest, filterThrOrderRequest); List> datas = exportThrOrders(filterThrOrderRequest); excelData.addAll(datas); @@ -197,6 +218,15 @@ public class ThrOrdersDlService { thrOrderExportLogService.updateThrOrderExportLog(thrOrderExportLogEntity); } + public String getName(List bussinessTypeEntities, String action) { + for (BussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) { + if (bussinessTypeEntity.getAction().equals(action)) { + return bussinessTypeEntity.getName(); + } + } + return action; + } + @Async public void uploadSmp(String genKey, ThrOrderExportRequest thrOrderExportRequest) { @@ -282,7 +312,7 @@ public class ThrOrdersDlService { filterThrOrderRequest.setLimit(limit); filterThrOrderRequest.setBillAction(action); FilterOrderRequest filterOrderRequest = new FilterOrderRequest(); - BeanUtils.copyProperties(filterThrOrderRequest,filterOrderRequest); + BeanUtils.copyProperties(filterThrOrderRequest, filterOrderRequest); BaseResponse> responseBaseResponse = new ErpOrderClient(orderUrl).getErpOrderResponse(filterOrderRequest); if (responseBaseResponse != null && responseBaseResponse.getCode() == 20000) { List erpOrderResponses = responseBaseResponse.getData().getList(); @@ -325,6 +355,9 @@ public class ThrOrdersDlService { } public List> exportThrOrders(FilterThrOrderRequest filterThrOrderRequest) { + BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); + bussinessTypeFilterRequest.setEnabled(true); + List bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest); BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("orderQueryUrl", filterThrOrderRequest.getThirdSysFk()); int page = 1; int limit = 100; @@ -348,16 +381,26 @@ public class ThrOrdersDlService { List rows = new ArrayList<>(); rows.add(erpOrderResponse.getBillNo()); rows.add(erpOrderResponse.getBilldate()); + BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(erpOrderResponse.getCorpId(), filterThrOrderRequest.getThirdSysFk()); +// if (basicUnitMaintainEntity != null) +// rows.add(basicUnitMaintainEntity.getErpId()); +// else rows.add(erpOrderResponse.getCorpId()); +// rows.add(basicUnitMaintainEntity.getErpId()); +// rows.add(erpOrderResponse.getCorpId()); rows.add(erpOrderResponse.getCorpName()); - rows.add(erpOrderResponse.getBillType()); + rows.add(getName(bussinessTypeEntities, erpOrderResponse.getBillType())); +// rows.add(erpOrderResponse.getBillType()); rows.add(erpOrderResponse.getBillFlag()); rows.add(subPurchase.getProductId()); rows.add(subPurchase.getProductName()); + rows.add(subPurchase.getSpec()); + rows.add(subPurchase.getBatchNo()); rows.add(subPurchase.getProductDate()); rows.add(subPurchase.getExpireDate()); rows.add(subPurchase.getCount() + ""); rows.add(subPurchase.getReCount() + ""); + rows.add(erpOrderResponse.getOriginType()); excelData.add(rows); } } @@ -403,6 +446,9 @@ public class ThrOrdersDlService { public List> genExcelData(FilterThrOrderRequest filterThrOrderRequest) { + BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest(); + bussinessTypeFilterRequest.setEnabled(true); + List bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest); List> excelData = new ArrayList<>(); List thrOrderEntities = thrOrderService.filterThrOrder(filterThrOrderRequest); for (ThrOrderEntity thrOrderEntity : thrOrderEntities) { @@ -412,19 +458,28 @@ public class ThrOrdersDlService { if (thrOrderDetailEntities != null) { for (ThrOrderDetailEntity thrOrderDetailEntity : thrOrderDetailEntities) { List rows = new ArrayList<>(); - rows.add(thrOrderEntity.getBillNo()); rows.add(thrOrderEntity.getBilldate()); + +// BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(thrOrderEntity.getCorpId(), filterThrOrderRequest.getThirdSysFk()); +// if (basicUnitMaintainEntity != null) +// rows.add(basicUnitMaintainEntity.getErpId()); +// else rows.add(thrOrderEntity.getCorpId()); + +// rows.add(thrOrderEntity.getCorpId()); rows.add(thrOrderEntity.getCorpName()); - rows.add(thrOrderEntity.getBillType()); + rows.add(getName(bussinessTypeEntities, thrOrderEntity.getBillType())); rows.add(thrOrderEntity.getBillFlag()); rows.add(thrOrderDetailEntity.getProductId()); rows.add(thrOrderDetailEntity.getProductName()); + rows.add(thrOrderDetailEntity.getSpec()); + rows.add(thrOrderDetailEntity.getBatchNo()); rows.add(thrOrderDetailEntity.getProductDate()); rows.add(thrOrderDetailEntity.getExpireDate()); rows.add(thrOrderDetailEntity.getCount() + ""); rows.add(thrOrderDetailEntity.getReCount() + ""); + rows.add(thrOrderEntity.getOriginType()); excelData.add(rows); } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java index 0e410672..0125e966 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java +++ b/api-admin/src/main/java/com/glxp/api/admin/thread/ThrProductsDlService.java @@ -21,10 +21,7 @@ import com.glxp.api.admin.service.thrsys.ThrProductsExportLogService; import com.glxp.api.admin.service.thrsys.ThrProductsImportDetailService; import com.glxp.api.admin.service.thrsys.ThrProductsImportLogService; import com.glxp.api.admin.service.thrsys.ThrProductsService; -import com.glxp.api.admin.util.Constant; -import com.glxp.api.admin.util.ExcelUtil; -import com.glxp.api.admin.util.HttpClient; -import com.glxp.api.admin.util.RedisUtil; +import com.glxp.api.admin.util.*; import com.glxp.api.common.res.BaseResponse; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; @@ -121,8 +118,11 @@ public class ThrProductsDlService { return thrProductsEntity; } ).collect(Collectors.toList()); - thrProductsService.insertThrProductss(thrProductsEntities); + List> splitList = CustomUtil.splitList(thrProductsEntities, 100); + for (List data : splitList) { + thrProductsService.insertThrProductss(data); + } redisUtil.set(Constant.dlThrProducts, "false"); thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); @@ -291,8 +291,11 @@ public class ThrProductsDlService { return thrProductsImportDetailEntity; } ).collect(Collectors.toList()); - thrProductsImportDetailService.insertProductsDetailImports(thrProductsImportDetailEntities); + List> splitList = CustomUtil.splitList(thrProductsImportDetailEntities, 100); + for (List data : splitList) { + thrProductsImportDetailService.insertProductsDetailImports(data); + } List thrProductsEntities; thrProductsEntities = thrProductsImportDetailEntities.stream().map( item -> { @@ -302,7 +305,10 @@ public class ThrProductsDlService { return thrProductsEntity; } ).collect(Collectors.toList()); - thrProductsService.insertThrProductss(thrProductsEntities); + List> products = CustomUtil.splitList(thrProductsEntities, 100); + for (List data : products) { + thrProductsService.insertThrProductss(data); + } thrProductsImportLogEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_SUCCESS); thrProductsImportLogEntity.setUpdateTime(new Date()); thrProductsImportLogService.updateImportLog(thrProductsImportLogEntity); diff --git a/api-admin/src/main/java/com/glxp/api/admin/upload/DownloadController.java b/api-admin/src/main/java/com/glxp/api/admin/upload/DownloadController.java new file mode 100644 index 00000000..4fad618f --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/upload/DownloadController.java @@ -0,0 +1,66 @@ +package com.glxp.api.admin.upload; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletResponse; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.OutputStream; + +@RestController +public class DownloadController { + + @GetMapping(value = "/udiwms/image/register/file/getImage") + public void getImage(HttpServletResponse response + , @RequestParam String type + , @RequestParam String name) throws IOException { + OutputStream os = null; + try { + // 读取图片 + BufferedImage image = ImageIO.read( + new FileInputStream(new File("d:/1s/udiwms/register/file/" + type + "/" + name))); + response.setContentType("image/png"); + os = response.getOutputStream(); + + if (image != null) { + ImageIO.write(image, "png", os); + } + } catch (IOException e) { + + } finally { + if (os != null) { + os.flush(); + os.close(); + } + } + } + + @GetMapping(value = "/udiwms/donwload/file") + public void download(HttpServletResponse response, + @RequestParam String fileName) throws IOException { + OutputStream os = null; + try { + FileInputStream input = new FileInputStream(new File(fileName)); + OutputStream out = response.getOutputStream(); + byte[] b = new byte[2048]; + int len; + while ((len = input.read(b)) != -1) { + out.write(b, 0, len); + } + input.close(); + } catch (IOException e) { + + } finally { + if (os != null) { + os.flush(); + os.close(); + } + } + } + +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/upload/uploadController.java b/api-admin/src/main/java/com/glxp/api/admin/upload/uploadController.java new file mode 100644 index 00000000..2ca31dce --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/upload/uploadController.java @@ -0,0 +1,100 @@ +package com.glxp.api.admin.upload; + +import com.glxp.api.common.enums.ResultEnum; +import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import java.io.File; +import java.io.IOException; +import java.io.UnsupportedEncodingException; +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + +/** + * 上传文件控制器 + */ +@RestController +public class uploadController { + /** + * 上传PDF模板 + */ + @PostMapping("/udiwms/upload/pdf/template") + public BaseResponse uploadPDFTemplate(@RequestParam("file") MultipartFile file) throws UnsupportedEncodingException { + if (file.isEmpty()) { + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件不能为空"); + } + + // 保存文件 --------------------- + String fileName = file.getOriginalFilename(); + String fileType = fileName.substring(fileName.lastIndexOf(".")); + // 文件类型判断 + if (StringUtils.isBlank(fileType) || !fileType.equals(".jasper")) { + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 jasper 格式"); + } + String newName = UUID.randomUUID()+fileType;//生成新文件名 + String savePath = "d:/1s/udiwms/pdf/template"; + + File file1 = new File(savePath); + if(!file1.exists()){// 判断目录是否存在 + file1.mkdirs();// 创建多层目录 + } + file1 = new File(savePath + "/" + newName) ; + try { + file.transferTo(file1); + Map rMap = new HashMap<>(); + rMap.put("msg", "上传成功"); + rMap.put("path", savePath + "/" + newName); + return ResultVOUtils.success(rMap); + } catch (IOException e) { + e.printStackTrace(); + } + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传失败"); + } + + /** + * 注册页面上传文件 + */ + @PostMapping("/udiwms/upload/register/file") + public BaseResponse uploadRegisterFile(@RequestParam("file") MultipartFile file, + @RequestParam("type") String type) throws UnsupportedEncodingException { + if (file.isEmpty()) { + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件不能为空"); + } + if (StringUtils.isBlank(type)) { + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件类型不能为空"); + } + + // 保存文件 --------------------- + String fileName = file.getOriginalFilename(); + String fileType = fileName.substring(fileName.lastIndexOf(".")); + // 文件类型判断 + if (StringUtils.isBlank(fileType) || !fileType.equals(".jpg") && !fileType.equals(".png")) { + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 .jpg,.png 格式"); + } + String newName = UUID.randomUUID()+fileType;//生成新文件名 + String savePath = "d:/1s/udiwms/register/file/" + type; + + File file1 = new File(savePath); + if(!file1.exists()){// 判断目录是否存在 + file1.mkdirs();// 创建多层目录 + } + file1 = new File(savePath + "/" + newName) ; + try { + file.transferTo(file1); + Map rMap = new HashMap<>(); + rMap.put("msg", "上传成功"); + rMap.put("name", newName); + rMap.put("type", type); + return ResultVOUtils.success(rMap); + } catch (IOException e) { + e.printStackTrace(); + } + return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传失败"); + } +} \ No newline at end of file diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java b/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java index ed9ff740..b3756fdd 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java +++ b/api-admin/src/main/java/com/glxp/api/admin/util/CustomUtil.java @@ -1,7 +1,9 @@ package com.glxp.api.admin.util; -import java.util.Random; -import java.util.UUID; +import org.apache.poi.ss.usermodel.CellType; +import org.apache.poi.ss.usermodel.Row; + +import java.util.*; public class CustomUtil { @@ -17,4 +19,65 @@ public class CustomUtil { id = id+number; return id.substring(4); } + + public static List> splitList(List list, int len) { + + if (list == null || list.isEmpty() || len < 1) { + return Collections.emptyList(); + } + + List> result = new ArrayList<>(); + + int size = list.size(); + int count = (size + len - 1) / len; + + for (int i = 0; i < count; i++) { + List subList = list.subList(i * len, ((i + 1) * len > size ? size : len * (i + 1))); + result.add(subList); + } + + return result; + } + + + public boolean filterEmpty(Row row) { + + if (row.getCell(0) != null) { + row.getCell(0).setCellType(CellType.STRING); + } + if (row.getCell(1) != null) { + row.getCell(1).setCellType(CellType.STRING); + } + if (row.getCell(2) != null) { + row.getCell(2).setCellType(CellType.STRING); + } + if (row.getCell(3) != null) { + row.getCell(3).setCellType(CellType.STRING); + } + if (row.getCell(4) != null) { + row.getCell(4).setCellType(CellType.STRING); + } + if (row.getCell(5) != null) { + row.getCell(5).setCellType(CellType.STRING); + } + if (row.getCell(6) != null) { + row.getCell(6).setCellType(CellType.STRING); + } + 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(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())) + )) { + return true; + } + return false; + } } diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/ITextPDFUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/ITextPDFUtils.java index 37e9baec..e76490ee 100644 --- a/api-admin/src/main/java/com/glxp/api/admin/util/ITextPDFUtils.java +++ b/api-admin/src/main/java/com/glxp/api/admin/util/ITextPDFUtils.java @@ -2,8 +2,8 @@ package com.glxp.api.admin.util; import cn.hutool.extra.qrcode.QrCodeUtil; import com.glxp.api.admin.entity.inout.ErpOrderEntity; -import com.glxp.api.admin.entity.inout.StockOrderDetailEntity; -import com.glxp.api.admin.entity.inout.StockOrderEntity; +import com.glxp.api.admin.entity.business.StockOrderDetailEntity; +import com.glxp.api.admin.entity.business.StockOrderEntity; import com.glxp.api.admin.req.itextpdf.InoutOrderDetailPDFCodeRequest; import com.glxp.api.admin.req.itextpdf.InoutOrderDetailPDFFileRequest; import com.glxp.api.admin.req.itextpdf.StockQRCodeTextPDFTemplateRequest; diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/JasperUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/JasperUtils.java new file mode 100644 index 00000000..da62ff25 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/JasperUtils.java @@ -0,0 +1,83 @@ +package com.glxp.api.admin.util; + +import com.alibaba.fastjson.JSON; +import net.sf.jasperreports.engine.*; +import net.sf.jasperreports.engine.export.ooxml.JRDocxExporter; +import net.sf.jasperreports.engine.query.JsonQueryExecuterFactory; +import net.sf.jasperreports.engine.util.JRLoader; +import net.sf.jasperreports.export.SimpleExporterInput; +import net.sf.jasperreports.export.SimpleOutputStreamExporterOutput; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.*; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; + +/** + * Jasperreport工具类 + * + * @author chenqf + * @date 2021-11-10 22:23 + */ +@Component +public class JasperUtils { + private static Logger logger = LoggerFactory.getLogger(JasperUtils.class); + + public static final String PDF_TYPE = "pdf"; + public static final String WORD_TYPE = "word"; + public static final String EXCEL_TYPE = "excel"; + public static final String HTML_TYPE = "html"; + + /* + * data 传入报表数据 + * jasperResource 模板文件路径 + */ + public static void jasperReport(HttpServletRequest request, HttpServletResponse response, Map data, String jasperResource, String type) throws IOException, JRException { + try { + HashMap map = new HashMap(); + + logger.error(JSON.toJSONString(data)); + + + InputStream is = new ByteArrayInputStream(JSON.toJSONString(data).getBytes("UTF-8")); + map.put("JSON_INPUT_STREAM", is); //填充报表数据 + map.put(JsonQueryExecuterFactory.JSON_LOCALE, Locale.ENGLISH); + +// ClassPathResource resource = new ClassPathResource(jasperResource); + FileInputStream jasperStream = new FileInputStream(new File(jasperResource)); + +// InputStream jasperStream = resource.getInputStream(); + + JasperReport jasperReport = (JasperReport) JRLoader.loadObject(jasperStream); + //报表填充 + JasperPrint jasperPrint = JasperFillManager.fillReport(jasperReport, map); + String fileName = new String("export.pdf".getBytes("GBK"), "ISO8859_1"); + ServletOutputStream os = response.getOutputStream(); + response.setDateHeader("Expires", 0); + response.setHeader("Content-disposition", "attachment; filename=" + fileName); + if (type != null && WORD_TYPE.equals(type)) { + response.setContentType("appliction/msword; charset=utf-8"); + JRDocxExporter exporter = new JRDocxExporter(); + exporter.setExporterInput(new SimpleExporterInput(jasperPrint)); + exporter.setExporterOutput(new SimpleOutputStreamExporterOutput(os)); + exporter.exportReport(); + } else { + response.setContentType("application/pdf; charset=utf-8"); + JasperExportManager.exportReportToPdfStream(jasperPrint, os); + os.flush(); + os.close(); + } + } catch (Exception e) { + + e.printStackTrace(); + + } + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/RsaUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/RsaUtils.java new file mode 100644 index 00000000..2fab9eba --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/RsaUtils.java @@ -0,0 +1,92 @@ +package com.glxp.api.admin.util; + +import cn.hutool.core.io.resource.ClassPathResource; +import org.apache.commons.codec.binary.Base64; + +import javax.crypto.Cipher; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.IOException; +import java.security.KeyFactory; +import java.security.PrivateKey; +import java.security.PublicKey; +import java.security.spec.PKCS8EncodedKeySpec; +import java.security.spec.X509EncodedKeySpec; + +public class RsaUtils { + + + public static String publicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtaHLiDtscnwyee4lG9jC" + + "8GUEZYIuBoz49W3GSy2LEOVpKRyiQNCjRmybvQS5qKdsb3pV720HQJnv/nQLnsg/" + + "vWbFc9L09fEeJdDZxQOf8D7CHeVgLd8+fh/GezQCVLijGlbAVORXOrFo5McdyOds" + + "LJey1x4HxIR13a79JHB7sdve14A2aS6bQ7NPWu8hM9LpJd1hylsXgdBpR+iX3DPF" + + "eep8Sx8jPnWfUfGF2pDNE3h1uz9RylGBYUz4tDPzz0IXO7vZkyUFXeslzKFDFcmh" + + "hbn1tobX+al4XvfRpjoCjST2mRfqCt4aNuBDM1LHMzyMBVJpfui91ikLGMgP4Gdf" + + "swIDAQAB"; + + /** + * RSA私钥加密 + */ + public static String privateKeyEncrypt(String str, String privateKey) throws Exception { + System.out.println("{}|RSA私钥加密前的数据|str:{}|publicKey:{}" + str + "\n" + privateKey); + //base64编码的公钥 + byte[] decoded = Base64.decodeBase64(privateKey); + PrivateKey priKey = KeyFactory.getInstance("RSA"). + generatePrivate(new PKCS8EncodedKeySpec(decoded)); + //RSA加密 + Cipher cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.ENCRYPT_MODE, priKey); + String outStr = Base64.encodeBase64String(cipher.doFinal(str.getBytes())); + System.out.println("{}|RSA私钥加密后的数据|outStr:{}" + "\n" + outStr); + return outStr; + } + + /** + * RSA公钥解密 + */ + public static String publicKeyDecrypt(String str, String publicKey) throws Exception { + System.out.println("{}|RSA公钥解密前的数据|str:{}|publicKey:{}" + str + "\n" + publicKey); + //64位解码加密后的字符串 + byte[] inputByte = Base64.decodeBase64(str.getBytes("UTF-8")); + //base64编码的私钥 + byte[] decoded = Base64.decodeBase64(publicKey); + PublicKey pubKey = KeyFactory.getInstance("RSA") + .generatePublic(new X509EncodedKeySpec(decoded)); + //RSA解密 + Cipher cipher = Cipher.getInstance("RSA"); + cipher.init(Cipher.DECRYPT_MODE, pubKey); + String outStr = new String(cipher.doFinal(inputByte)); + System.out.println("{}|RSA公钥解密后的数据|outStr:{}" + outStr); + return outStr; + } + + public static String readFileContent(String fileName) { + ClassPathResource resource = new ClassPathResource("config.txt"); + + File file = new File(resource.getAbsolutePath()); + BufferedReader reader = null; + StringBuffer sbf = new StringBuffer(); + try { + reader = new BufferedReader(new FileReader(file)); + String tempStr; + while ((tempStr = reader.readLine()) != null) { + sbf.append(tempStr); + } + reader.close(); + return sbf.toString(); + } catch (IOException e) { + e.printStackTrace(); + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e1) { + e1.printStackTrace(); + } + } + } + return sbf.toString(); + } + +} diff --git a/api-admin/src/main/java/com/glxp/api/admin/util/StockOrderBillNoUtils.java b/api-admin/src/main/java/com/glxp/api/admin/util/StockOrderBillNoUtils.java new file mode 100644 index 00000000..8bf336d3 --- /dev/null +++ b/api-admin/src/main/java/com/glxp/api/admin/util/StockOrderBillNoUtils.java @@ -0,0 +1,28 @@ +package com.glxp.api.admin.util; + +import java.text.SimpleDateFormat; +import java.util.Date; + +public class StockOrderBillNoUtils { + + public static String getBillNo(String action) { + + String prefix = ""; + switch (action) { + case "deliveryNote": + prefix = "SHD"; + break; + default: + prefix = "SP"; + break; + } + + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd"); + Date date = new Date(); + String dateStr = simpleDateFormat.format(date); + String randomStr = String.valueOf(((int) (Math.random() * 89997 + 1) + 10000)); + String rStr = prefix + dateStr + randomStr; + + return rStr; + } +} \ No newline at end of file diff --git a/api-admin/src/main/resources/application-pro.properties b/api-admin/src/main/resources/application-pro.properties index 7b2fbc8b..d46a7227 100644 --- a/api-admin/src/main/resources/application-pro.properties +++ b/api-admin/src/main/resources/application-pro.properties @@ -2,17 +2,13 @@ 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.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 logging.level.com.glxp.api.admin.erp.second=debug - #logback配置 - logging.path=output/logs # 不指定的情况下默认生成在项目根目录，按照配置生成所需的日志名称 logging.file=D:/udi.log @@ -20,7 +16,6 @@ logging.file=D:/udi.log UDI_SERVER_URL=https://www.udims.com/UDI_DL_Server #UDI_SERVER_URL=http://127.0.0.1:9994 ##端口号 - # Redis数据库索引（默认为0） spring.redis.database=0 # Redis服务器地址 @@ -39,10 +34,8 @@ spring.redis.jedis.pool.max-idle=8 spring.redis.jedis.pool.min-idle=0 # 连接超时时间（毫秒） spring.redis.jedis.timeout=300 - spring.jackson.date-format=yyyy-MM-dd HH:mm:ss spring.jackson.time-zone=GMT+8 - diff --git a/api-admin/src/main/resources/mybatis/mapper/auth/AuthCheckDao.xml b/api-admin/src/main/resources/mybatis/mapper/auth/AuthCheckDao.xml new file mode 100644 index 00000000..56a6c682 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/auth/AuthCheckDao.xml @@ -0,0 +1,55 @@ + + + + + + + + + + + + INSERT INTO auth_device_check + (machineInfo, remark, registerCode, createDate) + values (#{machineInfo}, + #{remark}, + #{registerCode}, #{createDate}) + + + + UPDATE auth_device_check + + remark=#{remark}, + registerCode=#{registerCode}, + createDate=#{createDate}, + + + WHERE machineInfo=#{machineInfo} + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml index 6e8ed8b3..d1d89a9a 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDao.xml @@ -27,7 +27,7 @@ AND thirdName = #{thirdName} - + AND enabled = #{enabled} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDetailDao.xml index 7bab01c1..a02d3bc3 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicThirdSysDetailDao.xml @@ -33,7 +33,7 @@ diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml index ef557eb4..3c56e6c7 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BasicUnitMaintainDao.xml @@ -22,8 +22,23 @@ AND id = #{id} - - AND unitId = #{unitId} + + AND erpId = #{erpId} + + + AND thirdId = #{thirdId} + + + AND thirdId1 = #{thirdId1} + + + AND thirdId2 = #{thirdId2} + + + AND thirdId3 = #{thirdId3} + + + AND thirdId4 = #{thirdId4} order by updateTime desc diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml index cf7315da..4316b6ec 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessLocalTypeDao.xml @@ -21,6 +21,27 @@ + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml new file mode 100644 index 00000000..2fbbd40b --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessOriginTypeDao.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml index cc441378..8f5ae002 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/BussinessTypeDao.xml @@ -37,7 +37,11 @@ AND mainAction LIKE concat(#{mainAction},'%') - + + AND basic_bussiness_type.enable =#{enable} + + + AND basic_third_sys.enabled =#{enabled} @@ -48,16 +52,19 @@ - replace INTO basic_bussiness_type + replace + INTO basic_bussiness_type (action,name,enable,remark,mainAction,localAction,thirdSysFk) values ( - #{action}, - #{name}, - #{enable}, - #{remark}, - #{mainAction},#{localAction},#{thirdSysFk} - ) + #{action}, + #{name}, + #{enable}, + #{remark}, + #{mainAction}, + #{localAction}, + #{thirdSysFk} + ) @@ -75,11 +82,15 @@ - DELETE FROM basic_bussiness_type WHERE id = #{id} + DELETE + FROM basic_bussiness_type + WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportDetailDao.xml index 38d693cc..f39d2212 100644 --- a/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/basic/UdiInfoImportDetailDao.xml @@ -28,20 +28,20 @@ parameterType="com.glxp.api.admin.entity.basic.UdiInfoImportDetailEntity"> insert INTO basic_products_import_detail (udiCode,ybbm,sptm,thirdId1,thirdId2, - thirdId3,thirdId4,thirdId,status,updateTime,remark,genKeyFk) + thirdId3,thirdId4,thirdId,status,updateTime,remark,genKeyFk,isUseDy) values ( #{udiCode}, #{ybbm},#{sptm}, #{thirdId1}, #{thirdId2},#{thirdId3}, #{thirdId4}, #{thirdId},#{status}, - #{updateTime},#{remark}, #{genKeyFk} + #{updateTime},#{remark}, #{genKeyFk},#{isUseDy} ) insert INTO basic_products_import_detail (udiCode,ybbm,sptm,thirdId1,thirdId2, - thirdId3,thirdId4,thirdId,status,updateTime,remark,genKeyFk) + thirdId3,thirdId4,thirdId,status,updateTime,remark,genKeyFk,isUseDy) values @@ -49,7 +49,7 @@ #{item.udiCode}, #{item.ybbm},#{item.sptm}, #{item.thirdId1}, #{item.thirdId2},#{item.thirdId3}, #{item.thirdId4}, #{item.thirdId},#{item.status}, - #{item.updateTime},#{item.remark}, #{item.genKeyFk} + #{item.updateTime},#{item.remark}, #{item.genKeyFk},#{item.isUseDy} ) @@ -74,6 +74,7 @@ status=#{status}, updateTime=#{updateTime}, remark=#{remark}, + isUseDy=#{isUseDy}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml similarity index 57% rename from api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml rename to api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml index 39817e38..3d4e1815 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDao.xml @@ -1,17 +1,17 @@ - + - SELECT * FROM stock_order where status = 'success' - select * from stock_order @@ -20,11 +20,11 @@ - + insert INTO stock_order(id, billNo, billdate, corpId, corpName, billType, billFlag, - thirdSysFk, status, statusInfo, type, sourceType, status2) - values ( - #{id}, + thirdSysFk, status, statusInfo, type, sourceType, printStatus, unitIdFk, customerId) + values (#{id}, #{billNo}, #{billdate}, #{corpId}, @@ -36,12 +36,11 @@ #{statusInfo}, #{type}, #{sourceType}, - #{status2} - ) + #{printStatus}, #{unitIdFk}, #{customerId}) - + UPDATE stock_order - + billNo=#{billNo}, billdate=#{billdate}, corpId=#{corpId}, @@ -53,8 +52,11 @@ statusInfo=#{statusInfo}, type=#{type}, sourceType=#{sourceType}, - status2=#{status2}, - + printStatus=#{printStatus}, + unitIdFk=#{unitIdFk}, + customerId=#{customerId}, + + WHERE id = #{id} @@ -75,8 +77,8 @@ SET `status` = #{status} where id = #{orderId} - SELECT * FROM stock_order @@ -115,8 +117,20 @@ and sourceType = #{sourceType} - - and status2 = #{status2} + + and printStatus = #{printStatus} + + + and unitIdFk = #{unitIdFk} + + + and customerId = #{customerId} + + + = DATE_FORMAT(#{startTime}, '%Y-%m-%d') ]]> + + + @@ -124,8 +138,8 @@ - SELECT * FROM stock_order @@ -137,9 +151,36 @@ and billNo =#{billNo} + + and customerId =#{customerId} + + limit 1 + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml new file mode 100644 index 00000000..562604d8 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetail.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + replace + INTO stock_order_detail(id, + orderIdFk,productId,productName,spec,batchNo,productDate, + expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh) + values( + #{id}, + #{orderIdFk}, + #{productId}, + #{productName}, + #{spec}, + #{batchNo}, + #{productDate}, + #{expireDate}, + #{count}, + #{reCount}, + #{sweepCount}, + #{ylqxzcrbarmc}, + #{zczbhhzbapzbh} + ) + + + + replace INTO stock_order_detail(id, + orderIdFk,productId,productName,spec,batchNo,productDate, + expireDate,count,reCount,sweepCount,ylqxzcrbarmc,zczbhhzbapzbh) + values + + ( + #{item.id}, + #{item.orderIdFk}, + #{item.productId}, + #{item.productName}, + #{item.spec}, + #{item.batchNo}, + #{item.productDate}, + #{item.expireDate}, + #{item.count}, + #{item.reCount}, + #{item.sweepCount}, + #{item.ylqxzcrbarmc}, + #{item.zczbhhzbapzbh} + ) + + + + + + UPDATE stock_order_detail + + batchNo=#{batchNo}, + productDate=#{productDate}, + expireDate=#{expireDate}, + sweepCount=#{sweepCount}, + count=#{count}, + reCount=#{reCount}, + + WHERE id = #{id} + + + + DELETE + FROM stock_order_detail + WHERE id = #{id} + + + + DELETE + FROM stock_order_detail + WHERE orderIdFk = #{id} + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDetail.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetailTemp.xml similarity index 72% rename from api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDetail.xml rename to api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetailTemp.xml index c342f700..84a529dd 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDetail.xml +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockOrderDetailTemp.xml @@ -1,11 +1,11 @@ - + - + select * from stock_order_detail_temp and orderIdFk = #{orderIdFk} @@ -26,9 +26,9 @@ ORDER BY id DESC - + replace - INTO stock_order_detail(id, + INTO stock_order_detail_temp(id, orderIdFk,productId,productName,spec,batchNo,productDate, expireDate,count,reCount,sweepCount) values( @@ -46,8 +46,8 @@ ) - - replace INTO stock_order_detail(id, + + replace INTO stock_order_detail_temp(id, orderIdFk,productId,productName,spec,batchNo,productDate, expireDate,count,reCount,sweepCount) values @@ -70,33 +70,32 @@ - - UPDATE stock_order_detail + + UPDATE stock_order_detail_temp batchNo=#{batchNo}, productDate=#{productDate}, expireDate=#{expireDate}, sweepCount=#{sweepCount}, - reCount=#{reCount}, WHERE id = #{id} DELETE - FROM stock_order_detail + FROM stock_order_detail_temp WHERE id = #{id} DELETE - FROM stock_order_detail + FROM stock_order_detail_temp WHERE orderIdFk = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/business/StockQRCodeText.xml b/api-admin/src/main/resources/mybatis/mapper/business/StockQRCodeText.xml new file mode 100644 index 00000000..c68f6907 --- /dev/null +++ b/api-admin/src/main/resources/mybatis/mapper/business/StockQRCodeText.xml @@ -0,0 +1,95 @@ + + + + + + + + + replace + INTO stock_qrcode_text(id, + orderId,detailId,text,textTag,status,param,create_time,update_time) + values( + #{id}, + #{orderId}, + #{detailId}, + #{text}, + #{textTag}, + #{status}, + #{param}, + #{create_time}, + #{update_time} + ) + + + + replace INTO stock_qrcode_text(id, + orderId,detailId,text,textTag,status,param,create_time,update_time) + values + + ( + #{item.id}, + #{item.orderId}, + #{item.detailId}, + #{item.text}, + #{item.textTag}, + #{item.status}, + #{item.param}, + #{item.create_time}, + #{item.update_time} + ) + + + + + + UPDATE stock_qrcode_text + + orderId=#{orderId}, + detailId=#{detailId}, + text=#{text}, + textTag=#{textTag}, + status=#{status}, + param=#{param}, + create_time=#{create_time}, + update_time=#{update_time}, + + WHERE id = #{id} + + + + DELETE + FROM stock_qrcode_text + WHERE id = #{id} + + + + DELETE + FROM stock_qrcode_text + WHERE orderId = #{id} + + + + + \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/info/SystemPDFModuleDao.xml b/api-admin/src/main/resources/mybatis/mapper/info/SystemPDFModuleDao.xml index b011e371..acd2512e 100644 --- a/api-admin/src/main/resources/mybatis/mapper/info/SystemPDFModuleDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/info/SystemPDFModuleDao.xml @@ -5,7 +5,7 @@ - SELECT * FROM system_pdf_template WHERE id=#{id} + SELECT * + FROM system_pdf_template + WHERE id = #{id} @@ -46,29 +49,30 @@ - insert INTO system_pdf_template(name, - type,module,param,path,rowCount,qrcodeCount,remark,create_time,update_time - ) values - ( - #{name}, - #{type}, - #{module}, - #{param}, - #{path}, - #{rowCount}, - #{qrcodeCount}, - #{remark}, - #{create_time}, - #{update_time} - ) + insert INTO system_pdf_template(name, + type, module, param, path, rowCount, qrcodeCount, remark, create_time, + update_time) + values (#{name}, + #{type}, + #{module}, + #{param}, + #{path}, + #{rowCount}, + #{qrcodeCount}, + #{remark}, + #{create_time}, + #{update_time}) - + SELECT id, name FROM system_pdf_template - delete from system_pdf_template where id = #{id} + delete + from system_pdf_template + where id = #{id} \ No newline at end of file diff --git a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml index e3a668fa..0ca871f4 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml @@ -122,6 +122,10 @@ and ( status = 1 or status=-1) + + and (contrastStatus = 0 or contrastStatus = 2) + + and exportStatus = #{exportStatus} diff --git a/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml b/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml index b4c92e8f..07934421 100644 --- a/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/inventory/InvStockPrintDao.xml @@ -7,7 +7,6 @@ resultType="com.glxp.api.admin.entity.inventory.StockPrintEntity"> SELECT * FROM inv_stockprint - AND nameCode = #{nameCode} @@ -32,6 +31,15 @@ AND genKeyFk = #{genKeyFk} + + AND sDetailId = #{sDetailId} + + + AND sOrderId = #{sOrderId} + + + AND id = #{id} + @@ -55,6 +63,7 @@ udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, produceDate,expireDate,serialNo,codeType,thirdId,thirdName, ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode,spaceCode,spaceName,genKeyFk,thirdSysFk + ,sOrderId,sDetailId,updateTime ) values ( @@ -73,7 +82,7 @@ #{ylqxzcrbarmc}, #{zczbhhzbapzbh}, #{warehouseName}, - #{warehouseCode},#{spaceCode},#{spaceName},#{genKeyFk},#{thirdSysFk} + #{warehouseCode},#{spaceCode},#{spaceName},#{genKeyFk},#{thirdSysFk},#{sOrderId},#{sDetailId},#{updateTime} ) @@ -83,6 +92,7 @@ udiCode,udiRlIdFk,nameCode,cpmctymc,batchNo, produceDate,expireDate,serialNo,codeType,thirdId,thirdName, ggxh,ylqxzcrbarmc,zczbhhzbapzbh,warehouseName,warehouseCode,spaceCode,spaceName,genKeyFk,thirdSysFk + ,sOrderId,sDetailId,updateTime ) values @@ -105,6 +115,7 @@ #{item.zczbhhzbapzbh}, #{item.warehouseName}, #{item.warehouseCode},#{item.spaceCode},#{item.spaceName},#{item.genKeyFk},#{item.thirdSysFk} + ,#{item.sOrderId},#{item.sDetailId},#{item.updateTime} ) @@ -117,6 +128,10 @@ DELETE FROM inv_stockprint WHERE genKeyFk = #{genKey} + + DELETE FROM inv_stockprint WHERE sOrderId = #{sOrderId} + + UPDATE inv_stockprint @@ -140,6 +155,8 @@ spaceCode=#{spaceCode}, spaceName=#{spaceName}, genKeyFk=#{genKeyFk}, + sOrderId=#{sOrderId}, + sDetailId=#{sDetailId}, WHERE id = #{id} diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml index 22b394fb..d420aff0 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrCorpDao.xml @@ -11,7 +11,7 @@ AND unitId = #{unitId} - AND ( name = #{name} or spell = #{name}) + AND ( name LIKE concat('%',#{name},'%') or spell LIKE concat('%',#{name},'%') ) AND thirdSysFk = #{thirdSysFk} @@ -22,22 +22,24 @@ - replace INTO thr_corp + replace + INTO thr_corp ( unitId,name,spell,addr,creditNo, contact,mobile,thirdSysFk,updateTime ) values ( - #{unitId}, - #{name}, - #{spell}, - #{addr}, - #{creditNo}, - #{contact}, - #{mobile}, - #{thirdSysFk},#{updateTime} - ) + #{unitId}, + #{name}, + #{spell}, + #{addr}, + #{creditNo}, + #{contact}, + #{mobile}, + #{thirdSysFk}, + #{updateTime} + ) @@ -64,10 +66,20 @@ - DELETE FROM thr_corp WHERE id = #{id} + DELETE + FROM thr_corp + WHERE id = #{id} + + + DELETE + FROM thr_corp + WHERE unitId = #{unitId} + + - DELETE FROM thr_corp + DELETE + FROM thr_corp UPDATE thr_corp diff --git a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml index 7ccfd155..a3331b2f 100644 --- a/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml +++ b/api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderImportDetailDao.xml @@ -29,12 +29,12 @@ insert INTO thr_order_import_detail ( billNo,billdate,corpId,corpName,billType,billFlag,productId,productName,spec,batchNo,expireDate, - productDate,count,reCount,status,updateTime,remark,genKeyFk,thirdSysFk + productDate,count,reCount,status,updateTime,remark,genKeyFk,thirdSysFk,originType ) values ( #{billNo},#{billdate},#{corpId},#{corpName},#{billType},#{billFlag},#{productId},#{productName},#{spec}, - #{batchNo},#{expireDate},#{productDate},#{count},#{reCount},#{status},#{updateTime},#{remark},#{genKeyFk},#{thirdSysFk} + #{batchNo},#{expireDate},#{productDate},#{count},#{reCount},#{status},#{updateTime},#{remark},#{genKeyFk},#{thirdSysFk},#{originType} ) @@ -42,7 +42,7 @@ insert INTO thr_order_import_detail ( billNo,billdate,corpId,corpName,billType,billFlag,productId,productName,spec, - batchNo,expireDate,productDate,count,reCount,status,updateTime,remark,genKeyFk,thirdSysFk + batchNo,expireDate,productDate,count,reCount,status,updateTime,remark,genKeyFk,thirdSysFk,originType ) values @@ -83,6 +83,8 @@ genKeyFk=#{genKeyFk}, remark=#{remark}, thirdSysFk=#{thirdSysFk}, + originType=#{originType}, + WHERE id = #{id} diff --git a/api-admin/src/test/java/com/glxp/api/admin/util/NormalTest.java b/api-admin/src/test/java/com/glxp/api/admin/util/NormalTest.java index a8bfcf47..44a3c851 100644 --- a/api-admin/src/test/java/com/glxp/api/admin/util/NormalTest.java +++ b/api-admin/src/test/java/com/glxp/api/admin/util/NormalTest.java @@ -1,5 +1,6 @@ package com.glxp.api.admin.util; +import cn.hutool.extra.pinyin.PinyinUtil; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,4 +22,9 @@ public class NormalTest { String data2 = "#32543535#5454#45#5453#"; log.info(FilterUdiUtils.getUdi(data2).toString()); } + + @Test + public void testPinyin(){ + log.info(PinyinUtil.getFirstLetter("厦门高理性派","")); + } }