lhq/FT517-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
zj
2026-01-23 09:44:38 +08:00
parent d8cb109415
commit 57f155566f
5 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWcsServiceImpl.java
View File

@@ -143,7 +143,6 @@ public class ToWcsServiceImpl implements IToWcsService {
Map<String,String> map = new HashMap<>();
map.put("taskCode", taskCode);
//@@@
RequestLog requestLog = requestLogService.getRequestLog(CANCEL_AGV_TASK, JSONUtil.toJsonStr(map), "取消任务","wms","wcs");
if ("1".equals(requestLog.getIsSuccessful())){

44
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
View File

@@ -133,21 +133,28 @@ public class ToWmsServiceImpl implements IToWmsService {
}
}
//查询物料信息
BasProduct basProductParam = new BasProduct();
basProductParam.setProductId(productId);
List<BasProduct> basProducts = basProductService.selectBasProductList(basProductParam);
BasProduct basProduct = basProducts.get(0);
if (CollUtil.isEmpty(basProducts)) {
return new AjaxResult(3, "物料不存在！");
}
//todo 创建工艺入库单
if ("2".equals(requestEnter.getFloor())){
AjaxResult workshopInboundOrder = toErpService.createWorkshopInboundOrder(basProduct,erpBill);
if (!workshopInboundOrder.isSuccess()){
throw new RuntimeException("创建工单失败,人工处理");
}
}
List<MydoJob> inList = mydoJobService.getInJobBySerial(serial);
List<BasStock> stockList = stockService.getStockBySerial(serial);
if(!CollUtil.isEmpty(inList) || !CollUtil.isEmpty(stockList)) {
return new AjaxResult(2,"该序列号已有作业或库存！");
}
//查询物料信息
BasProduct basProductParam = new BasProduct();
basProductParam.setProductId(productId);
List<BasProduct> basProducts = basProductService.selectBasProductList(basProductParam);
if (CollUtil.isEmpty(basProducts)) {
return new AjaxResult(3, "物料不存在！");
}
BasProduct basProduct = basProducts.get(0);
int size = Convert.toInt(basProduct.getSpare10());
if(size == 1){
@@ -177,7 +184,12 @@ public class ToWmsServiceImpl implements IToWmsService {
}
//生成作业
MydoJob mydoJob = new MydoJob();
//type=1是手持机调用
if (!"1".equals(requestEnter.getType())) {
mydoJob.setStatus("3");
}else{
mydoJob.setStatus("1");
}
mydoJob.setInOrOut(inOrOutType);
mydoJob.setExecutionPhase("1");
mydoJob.setWorkshopId(requestEnter.getFlag());
@@ -237,19 +249,7 @@ public class ToWmsServiceImpl implements IToWmsService {
//修改货位状态
basCargoSpace.setStatus("3");
basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
//type=1是手持机调用
if (!"1".equals(requestEnter.getType())) {
mydoJob.setStatus("3");
mydoJobService.updateMydoJob(mydoJob);
}
//todo 创建工艺入库单
if ("2".equals(requestEnter.getFloor())){
AjaxResult workshopInboundOrder = toErpService.createWorkshopInboundOrder(basProduct,erpBill);
if (!workshopInboundOrder.isSuccess()){
throw new RuntimeException("创建工单失败,人工处理");
}
}
//修改作业状态为正执行
result.put("jobId", mydoJob.getJobId());

1
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
View File

@@ -140,6 +140,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
String date = sdf.format(new Date());
ParsePosition pos = new ParsePosition(0);
mydoJob.setCreateTime(sdf.parse(date, pos));
mydoJob.setStartTime(date);
mydoJob.setJobId(basJobIdService.getJobId("RK"));
mydoJob.setTaskNo(Convert.toStr(basTaskNoService.getTaskNo("1")));
return mydoJobMapper.insertMydoJob(mydoJob);

8
ruoyi-admin/src/main/java/com/ruoyi/log/service/impl/RequestLogServiceImpl.java
View File

@@ -164,7 +164,7 @@ public class RequestLogServiceImpl implements IRequestLogService {
requestLog.setRequestBody(param);
requestLog.setRequestUrl(url);
try {
String resStr = HttpUtils.sendPostGd(url, param, "application/json");
String resStr = HttpUtils.sendPostGd(url, param, "application/json; charset=UTF-8");
log.info("调用ERP创建工艺单,请求参数："+param);
log.info("调用ERP创建工艺单,接口返回："+resStr);
// 判断resStr的状态码，如果不是200抛出异常让catch捕获
@@ -209,7 +209,7 @@ public class RequestLogServiceImpl implements IRequestLogService {
requestLog.setRequestBody(param);
requestLog.setRequestUrl(url);
try {
String resStr = HttpUtils.sendPostOther(url, param, "application/json");
String resStr = HttpUtils.sendPostOther(url, param, "application/json; charset=UTF-8");
log.info("调用ERP创建其他入出库单,请求参数："+param);
log.info("调用ERP创建其他入出库单,接口返回："+resStr);
// 判断resStr的状态码，如果不是200抛出异常让catch捕获
@@ -278,7 +278,7 @@ public class RequestLogServiceImpl implements IRequestLogService {
requestLog.setRequestUrl(url);
try {
String resStr = HttpUtils.sendPostDoc(url, param, "application/json");
String resStr = HttpUtils.sendPostDoc(url, param, "application/json; charset=UTF-8");
log.info("调用ERP获取工艺单号,请求参数："+param);
log.info("调用ERP获取工艺单号,接口返回："+resStr);
// 判断resStr的状态码，如果不是200抛出异常让catch捕获
@@ -343,7 +343,7 @@ public class RequestLogServiceImpl implements IRequestLogService {
requestLog.setRequestUrl(url);
try {
String resStr = HttpUtils.sendPostCode(url, param, "application/json");
String resStr = HttpUtils.sendPostCode(url, param, "application/json; charset=UTF-8");
log.info("调用ERP获取订单条码,请求参数："+param);
log.info("调用ERP获取订单条码,接口返回："+resStr);
// 判断resStr的状态码，如果不是200抛出异常让catch捕获

8
ruoyi-admin/src/main/java/com/ruoyi/utils/HttpUtils.java
View File

@@ -202,7 +202,7 @@ public class HttpUtils
conn.setRequestProperty("digi-service", "{\"prod\":\"E10\",\"ip\":\"192.168.116.179\",\"name\":\"yltk.wip_transfer_doc.create\",\"id\":\"E10_BLS_ZS_External\"}");
conn.setRequestProperty("digi-data-exchange-protocol", "1.0");
conn.setRequestProperty("digi-type", "sync");
conn.setRequestProperty("Accept-Charset", "utf-8");
//conn.setRequestProperty("Accept-Charset", "utf-8");
conn.setRequestProperty("Content-Type", contentType);
conn.setDoOutput(true);
conn.setDoInput(true);
@@ -276,7 +276,7 @@ public class HttpUtils
conn.setRequestProperty("digi-service", "{\"prod\":\"E10\",\"ip\":\"192.168.116.179\",\"name\":\"yltk.transaction_doc.create\",\"id\":\"E10_BLS_ZS_External\"}");
conn.setRequestProperty("digi-data-exchange-protocol", "1.0");
conn.setRequestProperty("digi-type", "sync");
conn.setRequestProperty("Accept-Charset", "utf-8");
//conn.setRequestProperty("Accept-Charset", "utf-8");
conn.setRequestProperty("Content-Type", contentType);
conn.setDoOutput(true);
conn.setDoInput(true);
@@ -402,7 +402,7 @@ public class HttpUtils
conn.setRequestProperty("digi-service", "{\"prod\":\"E10\",\"ip\":\"192.168.116.179\",\"name\":\"yltk.mo.query\",\"id\":\"E10_BLS_ZS_External\"}");
conn.setRequestProperty("digi-data-exchange-protocol", "1.0");
conn.setRequestProperty("digi-type", "sync");
conn.setRequestProperty("Accept-Charset", "utf-8");
//conn.setRequestProperty("Accept-Charset", "utf-8");
conn.setRequestProperty("Content-Type", contentType);
conn.setDoOutput(true);
conn.setDoInput(true);
@@ -468,7 +468,7 @@ public class HttpUtils
conn.setRequestProperty("digi-service", "{\"prod\":\"E10\",\"ip\":\"192.168.116.179\",\"name\":\"yltk.sales_order_doc.query\",\"id\":\"E10_BLS_ZS_External\"}");
conn.setRequestProperty("digi-data-exchange-protocol", "1.0");
conn.setRequestProperty("digi-type", "sync");
conn.setRequestProperty("Accept-Charset", "utf-8");
//conn.setRequestProperty("Accept-Charset", "utf-8");
conn.setRequestProperty("Content-Type", contentType);
conn.setDoOutput(true);
conn.setDoInput(true);