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

rev:入库新增全部分配按钮、发送飞书BUG修改、废箔下卷变更为点位+废箔

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2023-08-25 15:44:14 +08:00
parent 129c101c65
commit bb6fc64d15
10 changed files with 142 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -863,6 +863,10 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
map.put("error", whereJson.getString("error"));
map.put("error_msg", whereJson.getString("error_msg"));
map.put("error_update_time", DateUtil.now());
if (whereJson.getString("error").equals("0")){
map.put("is_upload", "0");
map.put("upload_time", DateUtil.now());
}
}
wo.update(map, "device_code = '" + device_code + "'");
}

8
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/impl/OutServiceImpl.java
View File

@@ -239,7 +239,13 @@ public class OutServiceImpl implements OutService {
if (StrUtil.isEmpty(empty_vehicle.getString("vehicle_code"))){
throw new BadRequestException("点位："+empty_vehicle.getString("point_code")+"载具号为空！");
}
jo.put("vehicle_code", "waste foil");
jo.put("vehicle_code", point_code+"废箔");
if (jo.getString("vehicle_code").contains("废箔")){
System.out.println("YES-------");
}
if (!jo.getString("vehicle_code").contains("废箔")){
System.out.println("NO-------");
}
jo.put("product_area", cut_ivt.getString("product_area"));
//分切>输送线 子卷出站
jo.put("task_type", "010404");

2
lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AutoSendFeiShu.java
View File

@@ -30,7 +30,7 @@ public class AutoSendFeiShu {
WQLObject wo = WQLObject.getWQLObject("em_bi_devicestatus");
//查询故障了还未发送的
JSONArray send_rows = wo.query("error > '0' AND is_upload = '0' AND upload_flag = '1'").getResultJSONArray(0);
JSONArray send_rows = wo.query("error > '0' AND IFNULL(is_upload,'0') = '0' AND upload_flag = '1'").getResultJSONArray(0);
this.sendInfo(send_rows);
//查询已经发送了但是还是故障中的

4
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/CutTrussTask.java
View File

@@ -126,7 +126,7 @@ public class CutTrussTask extends AbstractAcsTask {
//分切>输送线 子卷出站
if (jsonTask.getString("task_type").equals("010404")) {
if (!jsonTask.getString("vehicle_code").equals("waste foil")) {
if (!jsonTask.getString("vehicle_code").contains("废箔")) {
//更新出站气涨轴的分切计划状态
JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + jsonTask.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '06'").getResultJSONArray(0);
if (ObjectUtil.isEmpty(plan_jo2)) {
@@ -443,7 +443,7 @@ public class CutTrussTask extends AbstractAcsTask {
}
//分切>输送线 子卷出站
if (form.getString("task_type").equals("010404") && !json.getString("vehicle_code").equals("waste foil")) {
if (form.getString("task_type").equals("010404") && !json.getString("vehicle_code").contains("废箔")) {
//更新出站气涨轴的分切计划状态
JSONArray plan_jo2 = WQLObject.getWQLObject("PDM_BI_SlittingProductionPlan").query("qzzno = '" + json.getString("vehicle_code") + "' AND is_child_tz_ok = '1' AND is_child_ps_ok = '1' AND is_delete = '0' AND status = '05'").getResultJSONArray(0);
if (ObjectUtil.isEmpty(plan_jo2)) {

9
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/rest/RawAssistIStorController.java
View File

@@ -103,6 +103,15 @@ public class RawAssistIStorController {
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/allDivStruct")
@Log("全部分配货位")
@ApiOperation("全部分配货位")
//@PreAuthorize("@el.check('materialtype:list')")
public ResponseEntity<Object> allDivStruct(@RequestBody JSONObject whereJson) {
rawAssistIStorService.allDivStruct(whereJson);
return new ResponseEntity<>(HttpStatus.NO_CONTENT);
}
@PostMapping("/unDivStruct")
@Log("取消分配货位")
@ApiOperation("取消分配货位")

2
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/RawAssistIStorService.java
View File

@@ -34,6 +34,8 @@ public interface RawAssistIStorService {
void divStruct(Map whereJson);
void allDivStruct(JSONObject form);
void unDivStruct(Map whereJson);
void divPoint(Map whereJson);

41
lms/nladmin-system/src/main/java/org/nl/wms/st/inbill/service/impl/RawAssistIStorServiceImpl.java
View File

@@ -38,10 +38,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.*;
/**
* PC端出入库新增
@@ -648,6 +645,42 @@ public class RawAssistIStorServiceImpl implements RawAssistIStorService {
}
}
@Override
@Transactional
public void allDivStruct(JSONObject form) {
String iostorinv_id = form.getString("iostorinv_id");
String sect_id = form.getString("sect_id");
JSONObject sect_jo = WQLObject.getWQLObject("st_ivt_sectattr").query("sect_id = '"+sect_id+"'").uniqueResult(0);
if (!sect_jo.getString("sect_type_attr").equals("09")){
throw new BadRequestException("只能对虚拟区的库区进行全部分配！");
}
//查询当前入库单状态为生成的入库单明细
JSONArray dis_rows =WQLObject.getWQLObject("ST_IVT_IOStorInvDis").query("iostorinv_id = '" + iostorinv_id + "' AND work_status = '00'").getResultJSONArray(0);
HashSet<String> vehicle_set = new HashSet<>();
for (int j = 0; j < dis_rows.size(); j++) {
JSONObject dtl_row = dis_rows.getJSONObject(j);
vehicle_set.add(dtl_row.getString("box_no"));
}
for (String vehicle_code : vehicle_set) {
HashMap<String, String> map = new HashMap<>();
map.put("flag", "4");
map.put("iostorinv_id", iostorinv_id);
map.put("package_box_sn", vehicle_code);
JSONArray dtl_rows = WQL.getWO("QST_IVT_RAWASSISTISTOR").addParamMap(map).process().getResultJSONArray(0);
List<Map> list = new ArrayList<>();
for (int i = 0; i < dtl_rows.size(); i++) {
JSONObject jo = dtl_rows.getJSONObject(i);
list.add(JSON.parseObject(jo.toString(),Map.class));
}
Map<String,Object> dis_map = new HashMap<>();
dis_map.put("tableMater",list);
dis_map.put("sect_id",sect_id);
dis_map.put("checked",true);
this.divStruct(dis_map);
}
}
@Transactional(rollbackFor = Exception.class)
@Override
public void unDivStruct(Map jo) {