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

Merge branch 'master' of http://121.40.234.130:8899/root/rongLiJiaNai

Browse Source
This commit is contained in:
18188916393
2022-09-28 21:39:39 +08:00
parent d509f946b8 5d64cdebcb
commit 32d0f6f35f
10 changed files with 49 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wms/hd/nladmin-system/src/main/java/org/nl/wms/Cribbing/service/impl/CribbinginfoServiceImpl.java
View File

@@ -2,6 +2,7 @@
package org.nl.wms.Cribbing.service.impl;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import lombok.RequiredArgsConstructor;
import org.nl.exception.BadRequestException;
@@ -37,9 +38,19 @@ public class CribbinginfoServiceImpl implements CribbinginfoService {
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
// WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
// ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc");
// final JSONObject json = rb.pageResult();
// return json;
WQLObject wo = WQLObject.getWQLObject("md_me_cribbinginfo");
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), "1=1", "update_time desc");
String name = (String) whereJson.get("name");
String sql = "1=1";
if (StrUtil.isNotEmpty(name)) {
sql = " (material_code like '%" + name + "%' OR material_name like '%" + name + "%')";
}
ResultBean rb = wo.pagequery(WqlUtil.getHttpContext(page), sql + " and is_delete='0'", "update_time desc");
final JSONObject json = rb.pageResult();
log.info("json:{}", json);
return json;
}

2
wms/hd/nladmin-system/src/main/java/org/nl/wms/pdm/service/impl/ProducetaskServiceImpl.java
View File

@@ -300,7 +300,7 @@ public class ProducetaskServiceImpl implements ProducetaskService {
taskObj = WQL.getWO("PDM_ProduceTask_01").addParam("flag", "4").addParam("producetask_id", producetask_id).process().uniqueResult(0);
}
taskObj.put("product_code", "wms");
taskObj.put("product_type", "wms");
WmsToAcsService wmsToAcsService = SpringContextHolder.getBean(WmsToAcsService.class);
JSONArray arr = new JSONArray();
arr.add(taskObj);

4
wms/hd/nladmin-system/src/main/java/org/nl/wms/st/in/service/impl/WorkprocedureiosServiceImpl.java
View File

@@ -44,7 +44,7 @@ import cn.hutool.core.util.ObjectUtil;
@Slf4j
public class WorkprocedureiosServiceImpl implements WorkprocedureiosService {
private final String THIS_CLASS = SendMaterialTask.class.getName();
private SendMaterialTask sendMaterialTask;
@Override
public Map<String, Object> queryAll(Map whereJson, Pageable page) {
@@ -238,7 +238,7 @@ public class WorkprocedureiosServiceImpl implements WorkprocedureiosService {
@Override
@Transactional(rollbackFor = Exception.class)
public void genTask(JSONObject taskJson) {
SendMaterialTask sendMaterialTask = new SendMaterialTask();
String iostorinv_id = taskJson.getString("iostorinv_id");
WQLObject wo = WQLObject.getWQLObject("st_ivt_workprocedureios");
JSONObject jsonObject = wo.query("iostorinv_id = '" + iostorinv_id + "'").uniqueResult(0);