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

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

Browse Source
This commit is contained in:
liyongde
2025-03-07 08:54:46 +08:00
parent f89bc19207 e127093717
commit 565a612f6d
2 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/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -204,7 +204,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
throw new BadRequestException("当前任务的处理类未找到！"); throw new BadRequestException("当前任务的处理类未找到！");
} }
AbstractAcsTask abstractTask = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(task.getString("handle_class"))); AbstractAcsTask abstractTask = (AbstractAcsTask)SpringContextHolder.getBean(Class.forName(task.getString("handle_class")));
abstractTask.updateTaskStatus(task,Task_Status_Convers.get(row.getString("task_status"))); abstractTask.updateTaskStatus(row,Task_Status_Convers.get(row.getString("task_status")));
} else { } else {
throw new BadRequestException("任务标识为：" + task_id + "的任务正在操作中！"); throw new BadRequestException("任务标识为：" + task_id + "的任务正在操作中！");
} }

10
lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java
View File

@@ -6014,13 +6014,11 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
} }
@Override @Override
@Transactional(rollbackFor = Exception.class)
public void downloadExcel(HttpServletResponse response, Map whereJson) throws IOException { public void downloadExcel(HttpServletResponse response, Map whereJson) throws IOException {
WQLObject custTab = WQLObject.getWQLObject("MD_CS_CustomerBase"); // 客户基本信息表 WQLObject custTab = WQLObject.getWQLObject("MD_CS_CustomerBase"); // 客户基本信息表
WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_IOStorInv"); // 出入库主表 WQLObject mstTab = WQLObject.getWQLObject("ST_IVT_IOStorInv"); // 出入库主表
WQLObject dtlTab = WQLObject.getWQLObject("st_ivt_iostorinvdtl"); // 出入库明细表 WQLObject dtlTab = WQLObject.getWQLObject("st_ivt_iostorinvdtl"); // 出入库明细表
WQLObject disTab = WQLObject.getWQLObject("st_ivt_iostorinvdis"); // 出入库分配明细
WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); // 子卷包装关系表 WQLObject subTab = WQLObject.getWQLObject("pdm_bi_subpackagerelation"); // 子卷包装关系表
WQLObject tranTab = WQLObject.getWQLObject("MD_CS_TransportationBase"); // 物流公司表 WQLObject tranTab = WQLObject.getWQLObject("MD_CS_TransportationBase"); // 物流公司表
WQLObject storTab = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); // 实物仓库表 WQLObject storTab = WQLObject.getWQLObject("st_ivt_bsrealstorattr"); // 实物仓库表
@@ -6096,8 +6094,16 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
} else { } else {
shd_dtl_num = jsonCust.getIntValue("shd_dtl_num"); shd_dtl_num = jsonCust.getIntValue("shd_dtl_num");
if (ObjectUtil.isEmpty(shd_dtl_num)) {
throw new BadRequestException("客户编码:"+cust_code+"，送货单明细数未配置，请先去配置！");
}
//1.根据出入库主表中 收货单位 查询客户表中的模板路径 //1.根据出入库主表中 收货单位 查询客户表中的模板路径
code_template = jsonCust.getString("shd_print_no"); code_template = jsonCust.getString("shd_print_no");
if (StrUtil.isEmpty(code_template)) {
throw new BadRequestException("客户编码:"+cust_code+"，送货单打印模板号未配置，请先去配置！");
}
} }
JSONObject jsonDtl = dtlTab.query("iostorinv_id = '" + jsonMst.getString("iostorinv_id") + "'").uniqueResult(0); JSONObject jsonDtl = dtlTab.query("iostorinv_id = '" + jsonMst.getString("iostorinv_id") + "'").uniqueResult(0);