root/yinnihailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add 木箱分隔符处理

Browse Source
This commit is contained in:
ls
2026-02-01 16:23:52 +08:00
parent df6b492e95
commit 57128cd56d
5 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java
View File

@@ -58,4 +58,5 @@ public class FeedingController {
public ResponseEntity<Object> AGVPass(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(feedingService.AGVPass(whereJson), HttpStatus.OK);
}
}

15
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/FeedingServiceImpl.java
View File

@@ -42,6 +42,7 @@ import org.nl.wms.pdm.rawfoilworkorder.service.dao.mapper.SbPointIvtMapper;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.tasks.CoolCutTask;
import org.nl.wms.sch.tasks.OutHotTask;
import org.nl.wms.st.outbill.service.CheckOutBillService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -73,6 +74,12 @@ public class FeedingServiceImpl implements FeedingService {
@Autowired
private SchBaseTaskMapper schBaseTaskMapper;
@Autowired
private CoolCutTask coolCutTask;
@Autowired
private CheckOutBillService checkOutBillService;
@Override
public JSONObject queryMaterialInfo(JSONObject whereJson, HttpContext ctx) {
@@ -291,8 +298,7 @@ public class FeedingServiceImpl implements FeedingService {
param.put("point_code2", jsonCooIvt.getEmpty_point_code());
param.put("product_area", cut_jo.getProduct_area());
param.put("task_type", "010303");
AbstractAcsTask task = new CoolCutTask();
task.createTask(param);
coolCutTask.createTask(param);
}
//满轴送回
@@ -339,8 +345,7 @@ public class FeedingServiceImpl implements FeedingService {
param.put("product_area", cut_jo.getProduct_area());
param.put("vehicle_code", container_name);
param.put("task_type", "010304");
AbstractAcsTask task = new CoolCutTask();
task.createTask(param);
coolCutTask.createTask(param);
}
@@ -383,4 +388,6 @@ public class FeedingServiceImpl implements FeedingService {
jo.put("message", "操作成功!");
return jo;
}
}

4
lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/CoolPointIvtMapper.xml
View File

@@ -134,7 +134,7 @@
ORDER BY sort_seq DESC
</select>
<select id="selectCoolPoints" resultType="org.nl.wms.pdm.rawfoilworkorder.service.dao.CoolPointIvt">
<select id="selectCoolPoints" resultType="org.nl.wms.pdm.rawfoilworkorder.service.dao.CoolPointIvt" parameterType="com.alibaba.fastjson.JSONObject">
SELECT
*
FROM
@@ -164,7 +164,7 @@
)
<if test="param.product_area != null and param.product_area != ''">
AND product_area = #{product_area}
AND product_area = #{param.product_area}
</if>
<if test="param.point_location != null and param.point_location != ''">

7
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CoolCutTask.java
View File

@@ -70,6 +70,10 @@ public class CoolCutTask extends AbstractAcsTask {
private RawfoilWorkOrderMapper rawfoilWorkOrderMapper;
@Autowired
private CutConveyorTask cutConveyorTask;
@Override
public List<AcsTaskDto> addTask() {
/*
@@ -307,7 +311,7 @@ public class CoolCutTask extends AbstractAcsTask {
coolPointIvtMapper.updateById(jsonCoolIvt);
//更新母卷状态
RawfoilWorkOrder rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper<RawfoilWorkOrder>().eq(RawfoilWorkOrder::getContainer_name, schBaseTask.getMaterial_code()));
RawfoilWorkOrder rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper<RawfoilWorkOrder>().eq(RawfoilWorkOrder::getContainer_name, schBaseTask.getVehicle_code()));
rawfoilWorkOrder.setOrigin("3");
rawfoilWorkOrder.setRoll_status("3");
rawfoilWorkOrder.setUpdate_optid(currentUserId);
@@ -333,7 +337,6 @@ public class CoolCutTask extends AbstractAcsTask {
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task");
CutConveyorTask cutConveyorTask = new CutConveyorTask();
String currentUserId = SecurityUtils.getCurrentUserId();
String currentUsername = SecurityUtils.getCurrentUsername();

8
lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
View File

@@ -313,7 +313,7 @@ public class InBillQueryServiceImpl implements InBillQueryService {
if (StrUtil.isNotEmpty(box_name)) {
String[] s = box_name.split("木箱");
String s1 = s[1];
String[] split = s1.split("\\|");
String[] split = s1.split("\\\\");
mp.put("木箱规格/尺寸", split[1] + "*" + split[2]);
} else {
mp.put("木箱规格/尺寸", "");
@@ -493,7 +493,7 @@ public class InBillQueryServiceImpl implements InBillQueryService {
if (StrUtil.isNotEmpty(box_name)) {
String[] s = box_name.split("木箱");
String s1 = s[1];
String[] split = s1.split("\\|");
String[] split = s1.split("\\\\");
mp.put("木箱规格/尺寸", split[1] + "*" + split[2]);
} else {
mp.put("木箱规格/尺寸", "");
@@ -591,7 +591,7 @@ public class InBillQueryServiceImpl implements InBillQueryService {
if (StrUtil.isNotEmpty(box_name)) {
String[] s = box_name.split("木箱");
String s1 = s[1];
String[] split = s1.split("\\|");
String[] split = s1.split("\\\\");
mp.put("木箱规格/尺寸", split[1] + "*" + split[2]);
} else {
mp.put("木箱规格/尺寸", "");
@@ -654,4 +654,6 @@ public class InBillQueryServiceImpl implements InBillQueryService {
FileUtil.downloadExcel(list, response);
}
}