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

Merge remote-tracking branch 'origin/b_lms' into b_lms

Browse Source
This commit is contained in:
liyongde
2024-07-02 15:48:09 +08:00
parent 03a94a7179 2de875acd0
commit 6a2a26e3c4
4 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/nladmin-system/src/main/java/org/nl/b_lms/pdm/subpackagerelation/dao/mapper/PdmBiSubpackagerelationMapper.xml
View File

@@ -84,7 +84,7 @@
WHERE b.point_status = '3'
AND b.ivt_status = '3'
AND a.sale_order_name = #{sale_order_name}
ORDER BY box_group DESC
ORDER BY paper_tube_description
</select>

10
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoLashTask.java
View File

@@ -106,10 +106,20 @@ public class TwoLashTask extends AbstractAcsTask {
interaction_json.put("weight", dao.get(0).getBox_width());
interaction_json.put("height", dao.get(0).getBox_high());
// 捆扎模版
if (ObjectUtil.isEmpty(boxTypeDao.getLash_num())) {
throw new BadRequestException("捆扎模版不能为空!");
}
interaction_json.put("template", boxTypeDao.getLash_num());
// 第二次捆扎次数
if (ObjectUtil.isEmpty(boxTypeDao.getLash_num_tow())) {
throw new BadRequestException("第二次捆扎数不能为空!");
}
interaction_json.put("bindingTimes", boxTypeDao.getLash_num_tow());
// 是否二次捆扎
if (ObjectUtil.isEmpty(boxTypeDao.getNeed_lash_two())) {
throw new BadRequestException("是否第二次捆扎不能为空!");
}
interaction_json.put("isBinding", boxTypeDao.getNeed_lash_two());
char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1);
AcsTaskDto dto = AcsTaskDto.builder()

3
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/TwoSendOutTask.java
View File

@@ -84,6 +84,9 @@ public class TwoSendOutTask extends AbstractAcsTask {
if (ObjectUtil.isEmpty(boxTypeDao)) {
throw new BadRequestException("木箱类型信息不存在!木箱料号为："+boxDao.getMaterial_code());
}
if (ObjectUtil.isEmpty(boxTypeDao.getExpend_width())) {
throw new BadRequestException("货叉放货宽度不能为空!");
}
param.put("expandWidthLength",boxTypeDao.getExpend_width());
char dtl_type = json.getString("task_type").charAt(json.getString("task_type").length() - 1);

9
lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/LashManageServiceImpl.java
View File

@@ -275,18 +275,27 @@ public class LashManageServiceImpl implements LashManageService {
result.put("height", boxDao.getBox_high());
result.put("case", boxDao.getMaterial_code());
// 是否捆扎
if (ObjectUtil.isEmpty(boxTypeDao.getNeed_lash_one())) {
throw new BadRequestException("第一次是否捆扎不能为空!");
}
result.put("isBinding", boxTypeDao.getNeed_lash_one());
// TODO 是否贴标
result.put("isLabeling", IOSEnum.IS_SEND.code("否"));
// TODO 贴标模版
result.put("labelingTemplate", boxDao.getLash_num());
// 捆扎模板
if (ObjectUtil.isEmpty(boxTypeDao.getLash_num())) {
throw new BadRequestException("捆扎模版不能为空!");
}
result.put("bindingTemplate", boxTypeDao.getLash_num());
// TODO 打印机
result.put("printDevice", "1");
// TODO 贴标数量
result.put("printQty", "1");
// 第一次捆扎次数
if (ObjectUtil.isEmpty(boxTypeDao.getLash_num_one())) {
throw new BadRequestException("第一次捆扎数量不能为空!");
}
result.put("bundleTimes", boxTypeDao.getLash_num_one());
return result;