UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

自助平台同步bug修改

Browse Source
master
anthonywj 3 years ago
parent 501454a868
commit 3fd70cfdec
6 changed files with 121 additions and 75 deletions
Show Stats Download Patch File Download Diff File

70
src/main/java/com/glxp/api/controller/basic/BasicOrderPrintController.java
Unescape Escape View File

@ -72,19 +72,19 @@ public class BasicOrderPrintController {
//校验模板是否正确 //校验模板是否正确
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/pdf/template/inspection/order/file") @PostMapping("/udiwms/pdf/template/inspection/order/file")
public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest){ public BaseResponse inspectionStockOrderPDFFromTemplateFile(@RequestBody FilterOrderPrintRequest filterOrderPrintRequest) {
SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntityt=systemPDFTemplateRelevanceService.selectModuleldAndAction(filterOrderPrintRequest.getModuleId(),filterOrderPrintRequest.getAction()); SystemPDFTemplateRelevanceEntity systemPDFTemplateRelevanceEntityt = systemPDFTemplateRelevanceService.selectModuleldAndAction(filterOrderPrintRequest.getModuleId(), filterOrderPrintRequest.getAction());
if(systemPDFTemplateRelevanceEntityt!=null){ if (systemPDFTemplateRelevanceEntityt != null) {
SystemPDFTemplateEntity systemPDFTemplateEntity=systemPDFTemplateService.selectById(systemPDFTemplateRelevanceEntityt.getTemplateId()+""); SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(systemPDFTemplateRelevanceEntityt.getTemplateId() + "");
if (systemPDFTemplateEntity==null){ if (systemPDFTemplateEntity == null) {
return ResultVOUtils.error(999,"所属模板错误！"); return ResultVOUtils.error(999, "所属模板错误！");
}else{ } else {
return ResultVOUtils.success(systemPDFTemplateEntity.getId()); return ResultVOUtils.success(systemPDFTemplateEntity.getId());
} }
}else{ } else {
return ResultVOUtils.error(999,"所属模板错误！"); return ResultVOUtils.error(999, "所属模板错误！");
} }
} }
@ -100,20 +100,20 @@ public class BasicOrderPrintController {
SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式 SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");//定义新的日期格式
//查询打印格式 //查询打印格式
BasicBussinessTypeEntity basicBussinessTypeEntity=basicBussinessTypeService.findByAction(filterOrderPrintRequest.getAction()); BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(filterOrderPrintRequest.getAction());
//根据批次号打印 //根据批次号打印
if(basicBussinessTypeEntity.getOrderVisibleType()==0){ if (basicBussinessTypeEntity.getOrderVisibleType() == 0) {
//查询单据表 //查询单据表
FilterOrderRequest filterOrderRequest=new FilterOrderRequest(); FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
filterOrderRequest.setBillNo(filterOrderPrintRequest.getOrderIdFk()); filterOrderRequest.setBillNo(filterOrderPrintRequest.getOrderIdFk());
IoOrderResponse ioOrderResponse= ioOrderService.filterList(filterOrderRequest).get(0); IoOrderResponse ioOrderResponse = ioOrderService.filterList(filterOrderRequest).get(0);
//查询业务单详情 //查询业务单详情
List<IoOrderDetailBizEntity> ioOrderDetailBizEntityList=ioOrderDetailBizService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); List<IoOrderDetailBizEntity> ioOrderDetailBizEntityList = ioOrderDetailBizService.findByOrderId(filterOrderPrintRequest.getOrderIdFk());
int i = 1; int i = 1;
if (ioOrderDetailBizEntityList != null && ioOrderDetailBizEntityList.size() > 0) { if (ioOrderDetailBizEntityList != null && ioOrderDetailBizEntityList.size() > 0) {
for (IoOrderDetailBizEntity obj : ioOrderDetailBizEntityList) { for (IoOrderDetailBizEntity obj : ioOrderDetailBizEntityList) {
//查询产品表 //查询产品表
UdiProductEntity udiProductEntity=udiProductService.findByUuid(obj.getUuidFk()); UdiProductEntity udiProductEntity = udiProductService.findByUuid(obj.getUuidFk());
//组装数据 //组装数据
Map<String, Object> bizData = new HashMap<>(); Map<String, Object> bizData = new HashMap<>();
bizData.put("index", i); bizData.put("index", i);
@ -123,43 +123,45 @@ public class BasicOrderPrintController {
bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime())); bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime()));
bizData.put("remark1", obj.getRemark1() == null ? ' ' : obj.getRemark1()); bizData.put("remark1", obj.getRemark1() == null ? ' ' : obj.getRemark1());
bizData.put("remark2", obj.getRemark2() == null ? ' ' : obj.getRemark2()); bizData.put("remark2", obj.getRemark2() == null ? ' ' : obj.getRemark2());
// bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms()); bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms());
bizData.put("spmc", obj.getCoName() == null ? ' ' : obj.getCoName()); bizData.put("spmc", obj.getCoName() == null ? ' ' : obj.getCoName());
bizData.put("spec", obj.getSpec() == null ? ' ' : obj.getSpec()); bizData.put("spec", obj.getSpec() == null ? ' ' : obj.getSpec());
bizData.put("count", obj.getCount()); bizData.put("count", obj.getCount());
bizData.put("measname", obj.getMeasname() == null ? ' ' : obj.getMeasname()); bizData.put("measname", obj.getMeasname() == null ? ' ' : obj.getMeasname());
bizData.put("price", obj.getPrice() == null ? '0' : obj.getPrice()); bizData.put("price", obj.getPrice() == null ? '0' : obj.getPrice());
bizData.put("batchNo", obj.getBatchNo() == null ? ' ' : obj.getBatchNo()); bizData.put("batchNo", obj.getBatchNo() == null ? ' ' : obj.getBatchNo());
// bizData.put("serialNo", udiProductEntity.getSerialNo() == null ? ' ' : udiProductEntity.getSerialNo()); bizData.put("serialNo", udiProductEntity.getSerialNo() == null ? ' ' : udiProductEntity.getSerialNo());
bizData.put("productDate",obj.getProductDate()); bizData.put("productDate", obj.getProductDate());
bizData.put("expireDate", obj.getExpireDate()); bizData.put("expireDate", obj.getExpireDate());
bizData.put("manufactor", obj.getManufacturer()); bizData.put("manufactor", obj.getManufacturer());
// bizData.put("zczbhhzbapzbh",udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh()); bizData.put("zczbhhzbapzbh", udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh());
// bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
list.add(bizData); list.add(bizData);
i++; i++;
} }
} }
}else{ } else {
//查询单据表 //查询单据表
FilterOrderRequest filterOrderRequest=new FilterOrderRequest(); FilterOrderRequest filterOrderRequest = new FilterOrderRequest();
filterOrderRequest.setBillNo(filterOrderPrintRequest.getOrderIdFk()); filterOrderRequest.setBillNo(filterOrderPrintRequest.getOrderIdFk());
IoOrderResponse ioOrderResponse= ioOrderService.filterList(filterOrderRequest).get(0); IoOrderResponse ioOrderResponse = ioOrderService.filterList(filterOrderRequest).get(0);
//查询扫码单详情 //查询扫码单详情
List<IoCodeEntity> ioCodeEntityList=ioCodeService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); List<IoCodeEntity> ioCodeEntityList = ioCodeService.findByOrderId(filterOrderPrintRequest.getOrderIdFk());
//查询业务单据表 //查询业务单据表
List<IoOrderDetailBizEntity> ioOrderDetailBizEntityList=ioOrderDetailBizService.findByOrderId(filterOrderPrintRequest.getOrderIdFk()); List<IoOrderDetailBizEntity> ioOrderDetailBizEntityList = ioOrderDetailBizService.findByOrderId(filterOrderPrintRequest.getOrderIdFk());
int i = 1; int i = 1;
if (ioCodeEntityList != null && ioCodeEntityList.size() > 0) { if (ioCodeEntityList != null && ioCodeEntityList.size() > 0) {
IoOrderDetailBizEntity ioOrderDetailBizEntity=new IoOrderDetailBizEntity(); IoOrderDetailBizEntity ioOrderDetailBizEntity = new IoOrderDetailBizEntity();
for (IoCodeEntity obj : ioCodeEntityList) { for (IoCodeEntity obj : ioCodeEntityList) {
//查询业务表 //查询业务表
for(IoOrderDetailBizEntity ioObj:ioOrderDetailBizEntityList){ for (IoOrderDetailBizEntity ioObj : ioOrderDetailBizEntityList) {
if(ioObj.getBatchNo().equals(obj.getBatchNo()) && ioObj.getBindRlFk().equals(obj.getRelId())){ if (ioObj.getBatchNo().equals(obj.getBatchNo()) && ioObj.getBindRlFk().equals(obj.getRelId())) {
ioOrderDetailBizEntity=ioObj; ioOrderDetailBizEntity = ioObj;
break; break;
} }
} }
//查询产品表
UdiProductEntity udiProductEntity = udiProductService.findByUuid(ioOrderDetailBizEntity.getUuidFk());
//组装数据 //组装数据
Map<String, Object> bizData = new HashMap<>(); Map<String, Object> bizData = new HashMap<>();
bizData.put("index", i); bizData.put("index", i);
@ -169,7 +171,7 @@ public class BasicOrderPrintController {
bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime())); bizData.put("billdate", formatter.format(ioOrderResponse.getCreateTime()));
bizData.put("remark1", ioOrderDetailBizEntity.getRemark1() == null ? ' ' : ioOrderDetailBizEntity.getRemark1()); bizData.put("remark1", ioOrderDetailBizEntity.getRemark1() == null ? ' ' : ioOrderDetailBizEntity.getRemark1());
bizData.put("remark2", ioOrderDetailBizEntity.getRemark2() == null ? ' ' : ioOrderDetailBizEntity.getRemark2()); bizData.put("remark2", ioOrderDetailBizEntity.getRemark2() == null ? ' ' : ioOrderDetailBizEntity.getRemark2());
// bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms()); bizData.put("productName", udiProductEntity.getCpms() == null ? ' ' : udiProductEntity.getCpms());
bizData.put("spmc", ioOrderDetailBizEntity.getCoName() == null ? ' ' : ioOrderDetailBizEntity.getCoName()); bizData.put("spmc", ioOrderDetailBizEntity.getCoName() == null ? ' ' : ioOrderDetailBizEntity.getCoName());
bizData.put("spec", ioOrderDetailBizEntity.getSpec() == null ? ' ' : ioOrderDetailBizEntity.getSpec()); bizData.put("spec", ioOrderDetailBizEntity.getSpec() == null ? ' ' : ioOrderDetailBizEntity.getSpec());
bizData.put("count", ioOrderDetailBizEntity.getCount()); bizData.put("count", ioOrderDetailBizEntity.getCount());
@ -177,11 +179,11 @@ public class BasicOrderPrintController {
bizData.put("price", ioOrderDetailBizEntity.getPrice() == null ? '0' : ioOrderDetailBizEntity.getPrice()); bizData.put("price", ioOrderDetailBizEntity.getPrice() == null ? '0' : ioOrderDetailBizEntity.getPrice());
bizData.put("batchNo", ioOrderDetailBizEntity.getBatchNo() == null ? ' ' : ioOrderDetailBizEntity.getBatchNo()); bizData.put("batchNo", ioOrderDetailBizEntity.getBatchNo() == null ? ' ' : ioOrderDetailBizEntity.getBatchNo());
bizData.put("serialNo", obj.getSerialNo() == null ? ' ' : obj.getSerialNo()); bizData.put("serialNo", obj.getSerialNo() == null ? ' ' : obj.getSerialNo());
bizData.put("productDate",ioOrderDetailBizEntity.getProductDate()); bizData.put("productDate", ioOrderDetailBizEntity.getProductDate());
bizData.put("expireDate", ioOrderDetailBizEntity.getExpireDate()); bizData.put("expireDate", ioOrderDetailBizEntity.getExpireDate());
bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer()); bizData.put("manufactor", ioOrderDetailBizEntity.getManufacturer());
// bizData.put("zczbhhzbapzbh",udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh()); bizData.put("zczbhhzbapzbh", udiProductEntity.getZczbhhzbapzbh() == null ? ' ' : udiProductEntity.getZczbhhzbapzbh());
// bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc()); bizData.put("ylqxzcrbarmc", udiProductEntity.getYlqxzcrbarmc() == null ? ' ' : udiProductEntity.getYlqxzcrbarmc());
list.add(bizData); list.add(bizData);
i++; i++;
} }
@ -189,8 +191,6 @@ public class BasicOrderPrintController {
} }
data.put("data", list); data.put("data", list);
String param = JSON.toJSONString(data); String param = JSON.toJSONString(data);
JasperUtils.jasperReport(request, response, param, systemPDFTemplateEntity.getPath(), "pdf"); JasperUtils.jasperReport(request, response, param, systemPDFTemplateEntity.getPath(), "pdf");

38
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -91,6 +91,9 @@ public class IoCodeTempController extends BaseController {
InvProductDetailService invProductDetailService; InvProductDetailService invProductDetailService;
@Resource @Resource
IoCodeLostService codeLostService; IoCodeLostService codeLostService;
@Resource
IoOrderDetailBizService orderDetailBizService;
//手持端扫码单据上传调用接口 //手持端扫码单据上传调用接口
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@ -843,24 +846,39 @@ public class IoCodeTempController extends BaseController {
} }
//更新供应商
IoCodeTempEntity codeTempEntity = codeTempService.selectById(codeSaveRequest.getId()); IoCodeTempEntity codeTempEntity = codeTempService.selectById(codeSaveRequest.getId());
codeTempEntity.setSupId(codeSaveRequest.getSupId()); if (StrUtil.isNotEmpty(codeSaveRequest.getMySupId())) {
if (StrUtil.isNotEmpty(codeTempEntity.getSupId())) { codeTempEntity.setSupId(codeSaveRequest.getMySupId());
codeTempEntity.setSupId(codeTempEntity.getSupId()); codeTempService.updateById(codeSaveRequest);
codeTempService.updateById(codeTempEntity);
} }
if (codeTempEntity.getRelId() != null) {
codeTempEntity = codeTempService.selectById(codeTempEntity.getId());
int reCount = udiCalCountUtil.getActCount(codeTempEntity); //更新耗材字典
codeTempEntity.setReCount(reCount); if (codeSaveRequest.getRelId() != null) {
codeTempService.updateById(codeTempEntity);
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(codeTempEntity.getAction()); BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(codeTempEntity.getAction());
BaseResponse baseResponse = checkSupId(bussinessTypeEntity, codeTempEntity, codeTempEntity.getSupId()); BaseResponse baseResponse = checkSupId(bussinessTypeEntity, codeTempEntity, codeTempEntity.getSupId());
if (baseResponse != null) if (baseResponse != null)
return baseResponse; return baseResponse;
codeTempEntity.setRelId(codeSaveRequest.getRelId());
int reCount = udiCalCountUtil.getActCount(codeTempEntity);
codeTempEntity.setReCount(reCount);
} }
codeTempEntity = codeTempService.selectById(codeTempEntity.getId());
IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId()); IoOrderEntity orderEntity = orderService.findByBillNo(codeTempEntity.getOrderId());
BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
if (orderEntity.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.isCheckWebNew()) {
String errMsg = ioCheckInoutService.checkCode(codeTempEntity);
if (errMsg != null) {
return ResultVOUtils.error(500, errMsg);
} else
codeTempService.updateById(codeTempEntity);
} else {
codeTempService.updateById(codeTempEntity);
}
ioAddInoutService.genOrderDetailCode(orderEntity, codeTempEntity); ioAddInoutService.genOrderDetailCode(orderEntity, codeTempEntity);
return ResultVOUtils.success("绑定成功"); return ResultVOUtils.success("绑定成功");

30
src/main/java/com/glxp/api/upload/DownloadController.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.upload; package com.glxp.api.upload;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
@ -15,15 +16,39 @@ import java.io.OutputStream;
@RestController @RestController
public class DownloadController { public class DownloadController {
@Value("${file_path}")
private String filePath;
@GetMapping(value = "/udiwms/image/register/file/getImage") @GetMapping(value = "/udiwms/image/register/file/getImage")
public void getImage(HttpServletResponse response public void getImage(HttpServletResponse response
, @RequestParam String type , @RequestParam String type
, @RequestParam String name) throws IOException { , @RequestParam String name) throws IOException {
if (name.endsWith("pdf") || name.endsWith("doc")) {
OutputStream os = null;
try {
FileInputStream input = new FileInputStream(new File(filePath + "/register/file/" + type + "/" + name));
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();
}
}
} else {
OutputStream os = null; OutputStream os = null;
try { try {
// 读取图片 // 读取图片
BufferedImage image = ImageIO.read( BufferedImage image = ImageIO.read(
new FileInputStream(new File("d:/1s/udiwms/register/file/" + type + "/" + name))); new FileInputStream(new File(filePath + "/register/file/" + type + "/" + name)));
response.setContentType("image/png"); response.setContentType("image/png");
os = response.getOutputStream(); os = response.getOutputStream();
@ -40,6 +65,9 @@ public class DownloadController {
} }
} }
}
@GetMapping(value = "/udiwms/donwload/file") @GetMapping(value = "/udiwms/donwload/file")
public void download(HttpServletResponse response, public void download(HttpServletResponse response,
@RequestParam String fileName) throws IOException { @RequestParam String fileName) throws IOException {

6
src/main/java/com/glxp/api/upload/uploadController.java
Unescape Escape View File

@ -112,11 +112,11 @@ public class uploadController {
String fileName = file.getOriginalFilename(); String fileName = file.getOriginalFilename();
String fileType = fileName.substring(fileName.lastIndexOf(".")); String fileType = fileName.substring(fileName.lastIndexOf("."));
// 文件类型判断 // 文件类型判断
if (StringUtils.isBlank(fileType) || !fileType.equals(".jpg") && !fileType.equals(".png")) { if (StringUtils.isBlank(fileType) || (!fileType.equals(".jpg") && !fileType.equals(".png") && !fileType.equals(".doc") && !fileType.equals(".pdf"))) {
return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 .jpg,.png 格式"); return ResultVOUtils.error(ResultEnum.DATA_ERROR, "上传文件只能是 jpg,png,doc,pdf 格式");
} }
String newName = UUID.randomUUID() + fileType;//生成新文件名 String newName = UUID.randomUUID() + fileType;//生成新文件名
String savePath = "d:/1s/udiwms/register/file/" + type; String savePath = filePath + "/register/" + type;
File file1 = new File(savePath); File file1 = new File(savePath);
if (!file1.exists()) {// 判断目录是否存在 if (!file1.exists()) {// 判断目录是否存在

2
src/main/resources/application-pro.yml
Unescape Escape View File

@ -3,7 +3,7 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
jdbc-url: jdbc:mysql://192.168.0.66:3364/udi_wms_glxp?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true jdbc-url: jdbc:mysql://127.0.0.1:3306/udi_wms?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: Glxp@6066 password: Glxp@6066
hikari: hikari:

2
src/main/resources/application.yml
Unescape Escape View File

@ -1,6 +1,6 @@
spring: spring:
profiles: profiles:
active: pro active: dev
jmx: jmx:
enabled: true enabled: true

Write Preview
Loading…
Cancel
Save