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

rev:修改excel中update_id，create_id为数字类型；

Browse Source
This commit is contained in:
baoge
2023-04-14 15:19:14 +08:00
parent 1333a16763
commit 6f9eb90c58
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
mes/hd/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/stivt.xls
View File

Binary file not shown.

10
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/in/service/impl/SemiProductInServiceImpl.java
View File

@@ -7,7 +7,6 @@ import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.sun.org.apache.regexp.internal.RE;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@@ -57,6 +56,7 @@ public class SemiProductInServiceImpl implements SemiProductInService{
map.put("begin_time", MapUtil.getStr(whereJson, "begin_time")); map.put("begin_time", MapUtil.getStr(whereJson, "begin_time"));
map.put("end_time", MapUtil.getStr(whereJson, "end_time")); map.put("end_time", MapUtil.getStr(whereJson, "end_time"));
map.put("bill_status", MapUtil.getStr(whereJson, "bill_status")); map.put("bill_status", MapUtil.getStr(whereJson, "bill_status"));
map.put("product_code", MapUtil.getStr(whereJson, "product_code"));
map.put("bill_type", "0002"); map.put("bill_type", "0002");
if(ObjectUtil.isNotEmpty(bill_code)) { if(ObjectUtil.isNotEmpty(bill_code)) {
map.put("bill_code", "%" + bill_code + "%"); map.put("bill_code", "%" + bill_code + "%");
@@ -111,7 +111,7 @@ public class SemiProductInServiceImpl implements SemiProductInService{
whereJson.put("start_point_code", "ARK02"); whereJson.put("start_point_code", "ARK02");
//区域 //区域
whereJson.put("sect_id", "KQ004"); whereJson.put("sect_id", "KQ004");
//组盘确认 //2.组盘确认
JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + whereJson.getString("storagevehicle_code") + "' and is_delete = '0' and is_used = '1'").uniqueResult(0); JSONObject jsonVehicle = vehicleTab.query("storagevehicle_code = '" + whereJson.getString("storagevehicle_code") + "' and is_delete = '0' and is_used = '1'").uniqueResult(0);
if(ObjectUtil.isEmpty(jsonVehicle)) { if(ObjectUtil.isEmpty(jsonVehicle)) {
throw new BadRequestException("载具不存在"); throw new BadRequestException("载具不存在");
@@ -125,11 +125,11 @@ public class SemiProductInServiceImpl implements SemiProductInService{
jsonDis.put("storagevehicle_id", jsonVehicle.getString("storagevehicle_id")); jsonDis.put("storagevehicle_id", jsonVehicle.getString("storagevehicle_id"));
jsonDis.put("storagevehicle_code", jsonVehicle.getString("storagevehicle_code")); jsonDis.put("storagevehicle_code", jsonVehicle.getString("storagevehicle_code"));
disTab.update(jsonDis); disTab.update(jsonDis);
//2.自动分配货位 //3.自动分配货位
HashMap<String,String> dis_map = divStructs(whereJson); HashMap<String,String> dis_map = divStructs(whereJson);
whereJson.put("point_code", dis_map.get("struct_code")); whereJson.put("point_code", dis_map.get("struct_code"));
whereJson.put("point_id", dis_map.get("struct_id")); whereJson.put("point_id", dis_map.get("struct_id"));
//3.设置起点 //4.设置起点
JSONObject mst = WQLObject.getWQLObject("st_ivt_iostorinv").query("iostorinv_id = '" + whereJson.getString("iostorinv_id") + "'").uniqueResult(0); JSONObject mst = WQLObject.getWQLObject("st_ivt_iostorinv").query("iostorinv_id = '" + whereJson.getString("iostorinv_id") + "'").uniqueResult(0);
//如果终点已确定，创建任务 //如果终点已确定，创建任务
ProductInTask task = new ProductInTask(); ProductInTask task = new ProductInTask();
@@ -147,7 +147,7 @@ public class SemiProductInServiceImpl implements SemiProductInService{
point_map.put("task_id", task_id); point_map.put("task_id", task_id);
point_map.put("work_status", "01"); point_map.put("work_status", "01");
point_map.put("point_id", whereJson.getString("point_id") + ""); point_map.put("point_id", whereJson.getString("point_id") + "");
// 4.更新分配明细表 //5.更新分配明细表
int result = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").update(point_map, "iostorinvdtl_id = '" + whereJson.getString("iostorinvdtl_id") + "'").getSucess(); int result = WQLObject.getWQLObject("ST_IVT_IOStorInvDis").update(point_map, "iostorinvdtl_id = '" + whereJson.getString("iostorinvdtl_id") + "'").getSucess();
return RestBusinessTemplate.execute(() -> result); return RestBusinessTemplate.execute(() -> result);
} }

5
mes/hd/nladmin-system/src/main/java/org/nl/wms/st/wql/QST_IVT_PRODUCTIN_01.wql
View File

@@ -22,6 +22,7 @@
输入.bill_code TYPEAS s_string 输入.bill_code TYPEAS s_string
输入.iostorinvdtl_id TYPEAS s_string 输入.iostorinvdtl_id TYPEAS s_string
输入.iostorinv_id TYPEAS s_string 输入.iostorinv_id TYPEAS s_string
输入.product_code TYPEAS s_string
[临时表] [临时表]
@@ -80,6 +81,10 @@
bill_code LIKE 输入.bill_code bill_code LIKE 输入.bill_code
ENDOPTION ENDOPTION
OPTION 输入.product_code <> ""
product_code = 输入.product_code
ENDOPTION
ENDSELECT ENDSELECT
ENDPAGEQUERY ENDPAGEQUERY
ENDIF ENDIF