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

fix: 调试中出现的问题3

Browse Source
This commit is contained in:
liyongde
2025-03-30 15:26:17 +08:00
parent 867e99bd23
commit 4d94c58a6b
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -159,6 +159,8 @@ public class OutServiceImpl implements OutService {
.eq(order_type.equals("1"), PdmBiSlittingproductionplan::getParent_container_name, parent_container_name)
.eq(order_type.equals("2"), PdmBiSlittingproductionplan::getRestruct_container_name, restruct_container_name)
.eq(PdmBiSlittingproductionplan::getResource_name, resource_name)
.eq(PdmBiSlittingproductionplan::getIs_delete, "0")
.lt(PdmBiSlittingproductionplan::getStatus, "06")
.ne(PdmBiSlittingproductionplan::getSplit_group, split_group));
if (allPlans.size() > 0) {
// 判断当前是分切机的什么位置（上/下）

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

@@ -260,6 +260,7 @@ public class PaperTubeServiceImpl implements PaperTubeService {
.eq(Deliverycachepointivt::getProduct_area, area)
.eq(Deliverycachepointivt::getPoint_location, location)
.eq(Deliverycachepointivt::getIs_used, "1")
.eq(Deliverycachepointivt::getPoint_status, "01")
.like(Deliverycachepointivt::getCan_size, qzz_size));
if (canUsePoint.size() < number) {
throw new BadRequestException("该半区该尺寸类型的位置剩余【" + canUsePoint.size() + "】个");
@@ -498,7 +499,7 @@ public class PaperTubeServiceImpl implements PaperTubeService {
throw new BadRequestException("当前位置有未完成的任务!");
}
// 创建桁架任务，到内测输送线，新的任务类型
Deliverycachepointivt deliverCachePoint = deliverycachepointivtService.getOneByPointCode(pointCode, true);
Deliverycachepointivt deliverCachePoint = deliverycachepointivtService.getOneByPointCode(pointCode, true);
if (ObjectUtil.isNotEmpty(deliverCachePoint)) {
if (!deliverCachePoint.getPoint_status().equals("03")) {
throw new BadRequestException("该点位在系统中不是气胀轴！");

2
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/wql/PDA_02.wql
View File

@@ -178,7 +178,7 @@
FROM
sch_base_task
WHERE
( point_code1 = ivt.point_code OR point_code2 = ivt.point_code )
point_code2 = ivt.point_code
AND task_status < '07'
AND is_delete = '0'
)

3
lms/nladmin-system/src/main/java/org/nl/wms/pdm/ivt/deliverycache/service/dao/mapper/DeliverycachepointivtMapper.xml
View File

@@ -14,6 +14,7 @@
AND sd.can_size LIKE '%${conDto.qzzSize}%'
AND sd.point_status = #{conDto.pointStatus}
AND sd.point_type <![CDATA[ <> ]]> '03'
AND sd.is_used = '1'
AND 0 = (
SELECT
COUNT(*)
@@ -65,6 +66,7 @@
de.product_area = #{area}
AND de.point_location = #{location}
AND de.point_status = '03'
AND de.is_used = '1'
AND #{gxCode} IN (
SELECT IF( p.paper_tube_or_FRP = '1', p.paper_tube_material, p.FRP_material ) AS gx
FROM pdm_bi_slittingproductionplan p
@@ -81,6 +83,7 @@
de.product_area = #{area}
AND de.point_location = #{location}
AND de.point_status = '03'
AND de.is_used = '1'
AND EXISTS (
SELECT 1
FROM pdm_bi_slittingproductionplan p1

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

@@ -234,7 +234,7 @@ public class CutConveyorTask extends AbstractAcsTask {
if (RenUtils.isOpenTzArea(out_jo.getString("product_area"))) {
// hint: 超过1400 或者 饵料 需要送到新增的人工处理RGV上。
JSONObject rg_rgv_jo = WQLObject.getWQLObject("st_ivt_shaftivt").query("point_type = '10' AND product_area = '" + jsonTask.getString("product_area") + "'").uniqueResult(0);
if (out_jo.getString("vehicle_code").contains("废箔")) {
if (jsonTask.getString("vehicle_code").contains("废箔")) {
jo.put("point_code2", rg_rgv_jo.getString("point_code"));
} else {
List<String> list = JSON.parseArray(jsonTask.getString("request_param"), String.class);