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

opt: 取货完成的空位可以放货

Browse Source
This commit is contained in:
liyongde
2025-02-18 16:38:44 +08:00
parent b1fbce7f08
commit e2f665dc8c
5 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/IBstIvtCutpointivtService.java
View File

@@ -132,4 +132,6 @@ public interface IBstIvtCutpointivtService extends IService<BstIvtCutpointivt> {
* @return / * @return /
*/ */
List<BstIvtCutpointivt> getPintByAgvCodesByPointTypeAndArea(String area, List<String> types); List<BstIvtCutpointivt> getPintByAgvCodesByPointTypeAndArea(String area, List<String> types);
List<BstIvtCutpointivt> getNBJCanUsePoint(String type, String pointStatus, String area, String sort);
} }

2
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.java
View File

@@ -25,4 +25,6 @@ public interface BstIvtCutpointivtMapper extends BaseMapper<BstIvtCutpointivt> {
List<BstIvtCutpointivt> getReallyQzzSameDevice(String resourceName); List<BstIvtCutpointivt> getReallyQzzSameDevice(String resourceName);
List<BstIvtCutpointivt> getAreaNotTaskPointByStatusNotCheckPickUpCompleted(String type, String pointStatus, String area, String sort); List<BstIvtCutpointivt> getAreaNotTaskPointByStatusNotCheckPickUpCompleted(String type, String pointStatus, String area, String sort);
List<BstIvtCutpointivt> getNBJCanUsePoint(String type, String pointStatus, String area, String sort);
} }

26
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/dao/mapper/BstIvtCutpointivtMapper.xml
View File

@@ -136,4 +136,30 @@
ORDER BY bic.sort_seq DESC ORDER BY bic.sort_seq DESC
</if> </if>
</select> </select>
<select id="getNBJCanUsePoint" resultType="org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt">
SELECT bic.*
FROM bst_ivt_cutpointivt bic
WHERE bic.point_type = #{type}
AND bic.is_used = '1'
AND bic.point_status = #{pointStatus}
AND bic.point_location = #{area}
AND 0 = (SELECT COUNT(*)
FROM sch_base_task t
WHERE t.task_status <![CDATA[ < ]]> '07'
AND t.is_delete = '0'
AND (t.point_code1 = bic.point_code OR t.point_code2 = bic.point_code)
)
AND 0 = (SELECT COUNT(*)
FROM sch_base_task t
WHERE t.task_status = '071'
AND t.is_delete = '0'
AND t.point_code2 = bic.point_code
)
<if test="sort == '1'">
ORDER BY bic.sort_seq ASC
</if>
<if test="sort == '2'">
ORDER BY bic.sort_seq DESC
</if>
</select>
</mapper> </mapper>

5
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/cutpointivt/service/impl/BstIvtCutpointivtServiceImpl.java
View File

@@ -153,4 +153,9 @@ public class BstIvtCutpointivtServiceImpl extends ServiceImpl<BstIvtCutpointivtM
.eq(BstIvtCutpointivt::getProduct_area, area) .eq(BstIvtCutpointivt::getProduct_area, area)
.in(BstIvtCutpointivt::getPoint_type, types)); .in(BstIvtCutpointivt::getPoint_type, types));
} }
@Override
public List<BstIvtCutpointivt> getNBJCanUsePoint(String type, String pointStatus, String area, String sort) {
return bstIvtCutpointivtMapper.getNBJCanUsePoint(type, pointStatus, area, sort);
}
} }

5
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -1048,8 +1048,9 @@ public class SlitterServiceImpl implements SlitterService {
List<String> collect = plans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList()); List<String> collect = plans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList());
taskParam.put("containers", collect); taskParam.put("containers", collect);
} }
List<BstIvtCutpointivt> areaEmptyNotTaskPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1", // List<BstIvtCutpointivt> areaEmptyNotTaskPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1",
"1", "0", "2"); // "1", "0", "2");
List<BstIvtCutpointivt> areaEmptyNotTaskPoint = bcutpointivtService.getNBJCanUsePoint("1", "1", "0", "2");
if (areaEmptyNotTaskPoint.size() == 0) { if (areaEmptyNotTaskPoint.size() == 0) {
throw new BadRequestException("请求搬运失败，内包间没有可存放位置！"); throw new BadRequestException("请求搬运失败，内包间没有可存放位置！");
} }