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

Merge branch 'master' of http://47.111.78.178:8012/root/yinnihailiang_one

Browse Source 
# Conflicts:
#	lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
This commit is contained in:
郑旭明\73939
2026-02-10 16:10:36 +08:00
parent 0cc358b472 3f836d4e53
commit 75afc80a64
30 changed files with 663 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/SchBasePoint.java
View File

@@ -255,6 +255,10 @@ public class SchBasePoint extends Model<SchBasePoint> {
private String update_optname;
/**
* 修改时间
*/
@@ -275,6 +279,8 @@ public class SchBasePoint extends Model<SchBasePoint> {
/**
* 获取主键值
*

3
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.java
View File

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import org.nl.b_lms.sch.point.dao.SchBasePoint;
import org.nl.b_lms.sch.point.dto.SchBasePointDto;
import java.util.List;
@@ -54,7 +55,7 @@ public interface SchBasePointMapper extends BaseMapper<SchBasePoint> {
List<SchBasePoint> selectList(@Param("param") JSONObject map);
List<SchBasePoint> selectDjwPoints(@Param("param") JSONObject map);
List<SchBasePointDto> selectDjwPoints( JSONObject map);
@Select("SELECT * FROM sch_base_point WHERE region_code = 'BLKCK' and is_used = '1'")
List<SchBasePoint> selectByReginCode();

185
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/SchBasePointMapper.xml
View File

@@ -173,55 +173,115 @@
ORDER BY po.in_order_seq DESC
</select>
<select id="selectDjwPoints" resultType="org.nl.b_lms.sch.point.dao.SchBasePoint"
parameterType="com.alibaba.fastjson.JSONObject">
<!-- <select id="selectDjwPoints" resultType="org.nl.b_lms.sch.point.dto.SchBasePointDto"-->
<!-- >-->
<!-- SELECT-->
<!-- a.*,-->
<!-- b.num-->
<!-- FROM-->
<!-- sch_base_point a-->
<!-- INNER JOIN (-->
<!-- SELECT-->
<!-- COUNT(c.task_id) AS num,-->
<!-- c.point_code-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- task.task_id,-->
<!-- point_code-->
<!-- FROM-->
<!-- SCH_BASE_Point po-->
<!-- LEFT JOIN sch_base_task task ON task.point_code1 = po.point_code-->
<!-- AND task.task_status <![CDATA[ < ]]> '07'-->
<!-- AND task.is_delete = '0'-->
<!-- WHERE-->
<!-- po.is_delete = '0'-->
<!-- AND po.is_used = '1'-->
<!-- <if test="reging_id != null and reging_id != ''">-->
<!-- AND po.region_id = #{reging_id}-->
<!-- </if>-->
<!-- AND po.point_location = #{point_location}-->
<!-- <if test="point_type != null and point_type != ''">-->
<!-- AND po.point_type = #{point_type}-->
<!-- </if>-->
<!-- <if test="point_type == '5'">-->
<!-- AND IFNULL(po.material_code, '') = ''-->
<!-- </if>-->
<!-- <if test="mater_flag == '1'">-->
<!-- AND IFNULL(po.material_code, '') = ''-->
<!-- </if>-->
<!-- UNION-->
<!-- SELECT-->
<!-- task.task_id,-->
<!-- point_code-->
<!-- FROM-->
<!-- SCH_BASE_Point po-->
<!-- LEFT JOIN sch_base_task task ON task.point_code2 = po.point_code-->
<!-- AND task.task_status <![CDATA[ < ]]> '07'-->
<!-- AND task.is_delete = '0'-->
<!-- WHERE-->
<!-- po.is_delete = '0'-->
<!-- AND po.is_used = '1'-->
<!-- <if test="reging_id != null and reging_id != ''">-->
<!-- AND po.region_id = #{reging_id}-->
<!-- </if>-->
<!-- <if test="point_location != null and point_location != ''">-->
<!-- AND po.point_location = #{point_location}-->
<!-- </if>-->
<!-- <if test="point_type != null and point_type != ''">-->
<!-- AND po.point_type = #{point_type}-->
<!-- </if>-->
<!-- <if test="point_type == '5'">-->
<!-- AND IFNULL(po.material_code, '') = ''-->
<!-- </if>-->
<!-- <if test="mater_flag == '1'">-->
<!-- AND IFNULL(po.material_code, '') = ''-->
<!-- </if>-->
<!-- UNION-->
<!-- SELECT-->
<!-- task.task_id,-->
<!-- point_code-->
<!-- FROM-->
<!-- SCH_BASE_Point po-->
<!-- LEFT JOIN sch_base_task task ON task.point_code3 = po.point_code-->
<!-- AND task.task_status <![CDATA[ < ]]> '07'-->
<!-- AND task.is_delete = '0'-->
<!-- WHERE-->
<!-- po.is_delete = '0'-->
<!-- AND po.is_used = '1'-->
<!-- <if test="reging_id != null and reging_id != ''">-->
<!-- AND po.region_id = #{reging_id}-->
<!-- </if>-->
<!-- <if test="point_location != null and point_location != ''">-->
<!-- AND po.point_location = #{point_location}-->
<!-- </if>-->
<!-- <if test="point_type != null and point_type != ''">-->
<!-- AND po.point_type = #{point_type}-->
<!-- </if>-->
<!-- <if test="point_type == '5'">-->
<!-- AND IFNULL(po.material_code, '') = ''-->
<!-- </if>-->
<!-- <if test="mater_flag == '1'">-->
<!-- AND IFNULL(po.material_code, '') = ''-->
<!-- </if>-->
<!-- ) c-->
<!-- GROUP BY-->
<!-- c.point_code-->
<!-- ) b ON b.point_code = a.point_code-->
<!-- ORDER BY num, a.point_code-->
<!-- </select>-->
<select id="selectDjwPoints" resultType="org.nl.b_lms.sch.point.dto.SchBasePointDto">
SELECT
a.*,
b.num
FROM
sch_base_point a
INNER JOIN (
SELECT
COUNT(c.task_id) AS num,
c.point_code
FROM
(
SELECT
task.task_id,
point_code
*
FROM
SCH_BASE_Point po
LEFT JOIN sch_base_task task ON task.point_code1 = po.point_code
AND task.task_status <![CDATA[ < ]]> '07'
AND task.is_delete = '0'
WHERE
po.is_delete = '0'
AND po.is_used = '1'
<if test="reging_id != null and reging_id != ''">
AND po.region_id = #{reging_id}
</if>
AND po.point_location = #{point_location}
<if test="point_type != null and point_type != ''">
AND po.point_type = #{point_type}
</if>
<if test="point_type == '5'">
AND IFNULL(po.material_code, '') = ''
</if>
<if test="mater_flag == '1'">
AND IFNULL(po.material_code, '') = ''
</if>
UNION
SELECT
task.task_id,
point_code
FROM
SCH_BASE_Point po
LEFT JOIN sch_base_task task ON task.point_code2 = po.point_code
AND task.task_status <![CDATA[ < ]]> '07'
AND task.is_delete = '0'
WHERE
po.is_delete = '0'
AND po.is_used = '1'
@@ -241,38 +301,5 @@
AND IFNULL(po.material_code, '') = ''
</if>
UNION
SELECT
task.task_id,
point_code
FROM
SCH_BASE_Point po
LEFT JOIN sch_base_task task ON task.point_code3 = po.point_code
AND task.task_status <![CDATA[ < ]]> '07'
AND task.is_delete = '0'
WHERE
po.is_delete = '0'
AND po.is_used = '1'
<if test="reging_id != null and reging_id != ''">
AND po.region_id = #{reging_id}
</if>
<if test="point_location != null and point_location != ''">
AND po.point_location = #{point_location}
</if>
<if test="point_type != null and point_type != ''">
AND po.point_type = #{point_type}
</if>
<if test="point_type == '5'">
AND IFNULL(po.material_code, '') = ''
</if>
<if test="mater_flag == '1'">
AND IFNULL(po.material_code, '') = ''
</if>
) c
GROUP BY
c.point_code
) b ON b.point_code = a.point_code
ORDER BY num, a.point_code
</select>
</mapper>

169
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dto/SchBasePointDto.java
View File

@@ -6,6 +6,7 @@ import java.io.Serializable;
import lombok.*;
import lombok.Data;
import lombok.Builder;
import org.nl.b_lms.sch.point.dao.SchBasePoint;
/**
@@ -18,173 +19,9 @@ import lombok.Builder;
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class SchBasePointDto implements Serializable {
public class SchBasePointDto extends SchBasePoint implements Serializable {
private static final long serialVersionUID = -7739291296662381396L;
/**
* 点位标识
*/
private Long point_id;
/**
* 点位编码
*/
private String point_code;
/**
* 点位名称
*/
private String point_name;
/**
* 所属区域
*/
private Long region_id;
/**
* 区域编码
*/
private String region_code;
/**
* 区域名称
*/
private String region_name;
/**
* 点位类型
*/
private String point_type;
/**
* 点位状态
*/
private String point_status;
/**
* 锁定类型
*/
private String lock_type;
/**
* 物料标识
*/
private Long material_id;
/**
* 设备编码
*/
private String device_code;
/**
* MES设备编码
*/
private String mes_device_code;
/**
* 允许的载具类型
*/
private String can_vehicle_type;
/**
* 载具允许最大数量
*/
private BigDecimal vehicle_max_qty;
/**
* 载具类型
*/
private String vehicle_type;
/**
* 载具编码
*/
private String vehicle_code;
/**
* 载具数量
*/
private BigDecimal vehicle_qty;
/**
* 块
*/
private BigDecimal block_num;
/**
* 排
*/
private BigDecimal row_num;
/**
* 列
*/
private BigDecimal col_num;
/**
* 层
*/
private BigDecimal layer_num;
/**
* 入库顺序
*/
private BigDecimal in_order_seq;
/**
* 出库顺序
*/
private BigDecimal out_order_seq;
/**
* 入空载具顺序
*/
private BigDecimal in_empty_seq;
/**
* 出空载具顺序
*/
private BigDecimal out_empty_seq;
/**
* 点位组编码
*/
private String point_group_code;
/**
* 是否建工单
*/
private String is_have_workder;
/**
* 在执行的任务标识
*/
private Long task_id;
/**
* 生产区域
*/
private String product_area;
/**
* 备注
*/
private String remark;
/**
* 来源标识
*/
private Long source_id;
/**
* 是否启用
*/
private String is_used;
/**
* 是否删除
*/
private String is_delete;
/**
* 创建人
*/
private Long create_id;
/**
* 创建人
*/
private String create_name;
/**
* 创建时间
*/
private String create_time;
/**
* 修改人
*/
private Long update_optid;
/**
* 修改人
*/
private String update_optname;
/**
* 修改时间
*/
private String update_time;
/**
* 位置
*/
private String point_location;
/**
* 物料编码
*/
private String material_code;
private Integer num;
}

4
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.java
View File

@@ -1,6 +1,6 @@
package org.nl.b_lms.sch.task.dao.mapper;
import org.nl.b_lms.bst.ivt.cutpointivt.service.dao.BstIvtCutpointivt;
import org.apache.ibatis.annotations.Param;
import org.nl.b_lms.sch.task.dao.SchBaseTask;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -34,4 +34,6 @@ public interface SchBaseTaskMapper extends BaseMapper<SchBaseTask> {
* @return
*/
List<SchBaseTask> checkHaveStartTask(String code);
Integer selectTaskCount(@Param("code") String code);
}

7
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/dao/mapper/SchBaseTaskMapper.xml
View File

@@ -28,4 +28,11 @@
AND is_delete = '0'
AND point_code1 = #{code}
</select>
<select id="selectTaskCount" resultType="java.lang.Integer" parameterType="java.lang.String">
SELECT count(1)
FROM sch_base_task
WHERE task_status <![CDATA[ < ]]> '07'
AND is_delete = '0'
AND (point_code1 = #{code} or point_code2 = #{code} or point_code3 = #{code})
</select>
</mapper>

13
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java
View File

@@ -138,6 +138,17 @@ public class SlitterTaskUtil {
System.out.println(getComposePaperTubeInformation("玻璃纤维及其制品|FRP管|6英寸|15|1100", "1"));
}
/**
* 判断字符串是否为数字（整数、小数、负数）
*/
public static boolean isNumeric(String str) {
if (str == null || str.isEmpty() || str.trim().isEmpty()) {
return false;
}
String s = str.trim();
return s.matches("-?\\d+(\\.\\d+)?");
}
/**
* 设置所需的套管纸管信息
* @param param 任务参数
@@ -519,7 +530,7 @@ public class SlitterTaskUtil {
JSONObject item = jsonArray.getJSONObject(i);
String containerName = item.getString("container_name");
String site = item.getString("site");
String left_or_right = item.getString("left_or_right");
String left_or_right = item.getString("roll");
// 3. 检查 Plan 中是否存在对应的 container_name
if (!planMap.containsKey(containerName)) {

5
lms/nladmin-system/src/main/java/org/nl/config/mybatis/MybatisPlusConfig.java
View File

@@ -1,19 +1,16 @@
package org.nl.config.mybatis;
import com.alibaba.druid.pool.DruidDataSource;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.autoconfigure.ConfigurationCustomizer;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.OptimisticLockerInnerInterceptor;
import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
import com.github.pagehelper.PageInterceptor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.transaction.annotation.EnableTransactionManagement;
import javax.annotation.PostConstruct;
import javax.sql.DataSource;
@EnableTransactionManagement

1
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/FeedingController.java
View File

@@ -58,4 +58,5 @@ public class FeedingController {
public ResponseEntity<Object> AGVPass(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(feedingService.AGVPass(whereJson), HttpStatus.OK);
}
}

15
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/rest/RawFoilController.java
View File

@@ -44,7 +44,6 @@ public class RawFoilController {
@PostMapping("/queryRawFoilList")
@Log("查询生箔工单")
public ResponseEntity<Object> queryRawFoilList(@RequestBody JSONObject whereJson) {
HttpContext ctx = new HttpContext("11");
ctx.setPage((String) (whereJson.get("page")));
@@ -66,18 +65,18 @@ public class RawFoilController {
return new ResponseEntity<>(rawFoilService.confirmBlanking(whereJson), HttpStatus.OK);
}
@PostMapping("/scrollDowm")
@Log("下卷")
@PostMapping("/needEmptyAxis")
@Log("呼叫")
public ResponseEntity<Object> scrollDowm(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(rawFoilService.scrollDowm(whereJson), HttpStatus.OK);
public ResponseEntity<Object> needEmptyAxis(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(rawFoilService.needEmptyAxis(whereJson), HttpStatus.OK);
}
@PostMapping("/scrollDowmTest")
@Log("下卷")
@PostMapping("/needEmptyAxisTest")
@Log("呼叫")
public ResponseEntity<Object> scrollDowmTest(@RequestBody JSONObject whereJson) {
return new ResponseEntity<>(rawFoilService.scrollDowmTest(whereJson), HttpStatus.OK);
return new ResponseEntity<>(rawFoilService.needEmptyAxisTest(whereJson), HttpStatus.OK);
}
@PostMapping("/confirmWeight")

4
lms/nladmin-system/src/main/java/org/nl/wms/pda/mps/service/RawFoilService.java
View File

@@ -53,7 +53,7 @@ public interface RawFoilService {
* @param whereJson /
* @return JSONObject
*/
JSONObject scrollDowm(JSONObject whereJson);
JSONObject needEmptyAxis(JSONObject whereJson);
/**
* 下卷
@@ -61,7 +61,7 @@ public interface RawFoilService {
* @param whereJson /
* @return JSONObject
*/
JSONObject scrollDowmTest(JSONObject whereJson);
JSONObject needEmptyAxisTest(JSONObject whereJson);
JSONObject query(JSONObject whereJson, HttpContext ctx);

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

@@ -17,8 +17,10 @@ import org.nl.b_lms.sch.point.dao.SchBasePoint;
import org.nl.b_lms.sch.point.dao.StIvtCoolregionio;
import org.nl.b_lms.sch.point.dao.mapper.SchBasePointMapper;
import org.nl.b_lms.sch.point.dao.mapper.StIvtCoolregionioMapper;
import org.nl.b_lms.sch.point.dto.SchBasePointDto;
import org.nl.b_lms.sch.task.dao.SchBaseTask;
import org.nl.b_lms.sch.task.dao.mapper.SchBaseTaskMapper;
import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
import org.nl.b_lms.storage_manage.md.dao.MdMeMaterialBase;
import org.nl.b_lms.storage_manage.md.dao.mapper.MdMeMaterialBaseMapper;
import org.nl.common.utils.SecurityUtils;
@@ -32,6 +34,7 @@ import org.nl.modules.wql.core.content.HttpContext;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.modules.wql.util.WqlUtil;
import org.nl.system.service.param.ISysParamService;
import org.nl.system.service.param.impl.SysParamServiceImpl;
import org.nl.wms.basedata.st.service.impl.UserAreaServiceImpl;
import org.nl.wms.ext.acs.service.impl.WmsToAcsServiceImpl;
import org.nl.wms.pda.mps.eum.RegionTypeEnum;
@@ -40,19 +43,14 @@ import org.nl.wms.pda.mps.service.HandleBakingService;
import org.nl.wms.pdm.rawfoilworkorder.service.dao.*;
import org.nl.wms.pdm.rawfoilworkorder.service.dao.mapper.*;
import org.nl.wms.pdm.rawfoilworkorder.service.dto.HotPointIvtDto;
import org.nl.wms.sch.tasks.CutConveyorTask;
import org.nl.wms.sch.tasks.InCoolIvtTask;
import org.nl.wms.sch.tasks.InHotTask;
import org.nl.wms.sch.tasks.OutHotTask;
import org.nl.wms.sch.tasks.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.*;
import java.util.stream.Collectors;
@Service
@RequiredArgsConstructor
@@ -113,6 +111,12 @@ public class BakingServiceImpl implements BakingService {
String temperature = whereJson.getString("temperature"); // 温度
String hours = whereJson.getString("hours"); // 时间
String point_code1 = whereJson.getString("point_code"); // 点位
if (!SlitterTaskUtil.isNumeric(hours)) {
throw new BadRequestException("请输入合法的时间!");
}
if (!SlitterTaskUtil.isNumeric(temperature)) {
throw new BadRequestException("请输入合法的温度!");
}
//查询该点位是否存在未完成的任务
JSONObject hasTask = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code1 = '" + point_code1 + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
if (hasTask != null) {
@@ -136,12 +140,15 @@ public class BakingServiceImpl implements BakingService {
throw new BadRequestException("未查询到母卷号：" + container_name + "对应的生箔机台编号！");
}
String mes_used = paramService.findByCode("mes_used").getValue();
if (StrUtil.equals("1", mes_used)) {
if (!"1".equals(rawfoilWorkOrder.getIs_baking())) {
// String mes_used = paramService.findByCode("mes_used").getValue();
// if (StrUtil.equals("1", mes_used)) {
// if (!"1".equals(rawfoilWorkOrder.getIs_baking())) {
// throw new BadRequestException("该母卷在MES上未进行决策入烘箱，不允许进行入烘箱操作！");
// }
// }
if (StrUtil.equals("1", sbPointIvt.getMes_used()) && !"1".equals(rawfoilWorkOrder.getIs_baking())) {
throw new BadRequestException("该母卷在MES上未进行决策入烘箱，不允许进行入烘箱操作！");
}
}
if (ObjectUtil.isEmpty(container_name)) {
throw new BadRequestException("母卷号不能为空");
}
@@ -155,6 +162,11 @@ public class BakingServiceImpl implements BakingService {
throw new BadRequestException("点位不能为空");
}
String maxHour = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("MAX_HOUR").getValue();
if (Integer.parseInt(hours) >= Integer.parseInt(maxHour)) {
throw new BadRequestException("设置的最大烘烤时间不能超过"+maxHour+"分钟");
}
/*
* 根据点位判断是 冷却区入烘箱还是烘箱对接位入烘箱
*/
@@ -196,6 +208,9 @@ public class BakingServiceImpl implements BakingService {
}
}
}
if (ObjectUtil.isEmpty(jsonHotIvt)) {
throw new BadRequestException("烘烤区没有合适温度的空位！");
}
// 2.创建暂存位 --> 烘烤区任务
JSONObject param = new JSONObject();
param.put("type", "2"); // 1- 冷却区入烘箱 2- 暂存位入烘箱
@@ -205,7 +220,7 @@ public class BakingServiceImpl implements BakingService {
param.put("product_area", schBasePoint.getProduct_area());
param.put("request_param", NumberUtil.mul(Double.parseDouble(hours), 60));
InHotTask inHotTask = new InHotTask();
InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class);
String task_id = inHotTask.createTask(param);
// 3.插入主表
@@ -266,25 +281,24 @@ public class BakingServiceImpl implements BakingService {
//只找入箱点位
map.put("point_type", "4");
String point_code2 = "";
List<SchBasePoint> point_code2_jo = schBasePointMapper.selectList(map);
if (ObjectUtil.isNotEmpty(point_code2_jo)) {
point_code2 = point_code2_jo.get(0).getPoint_code();
if (ObjectUtil.isEmpty(point_code2_jo)) {
throw new BadRequestException("未查询到可用的点位类型为入箱的烘箱对接位（可能被占用，请稍后再试）！");
}
String point_code3 = "";
SchBasePoint point = point_code2_jo.get(0);
HotPointIvt jsonHotIvt = getJsonObject(product_area, point, temperature);
if (ObjectUtil.isNotEmpty(jsonHotIvt)) {
point_code3 = jsonHotIvt.getPoint_code();
if (ObjectUtil.isEmpty(jsonHotIvt)) {
throw new BadRequestException("烘烤区没有合适温度的空位！");
}
// 3.创建冷却区 --> 烘烤区任务
JSONObject param = new JSONObject();
param.put("type", "1"); // 1- 冷却区入烘箱 2- 暂存位入烘箱
param.put("point_code1", point_code1);
param.put("point_code2", point_code2);
param.put("point_code3", point_code3);
param.put("point_code2", point_code2_jo.get(0).getPoint_code());
param.put("point_code3", jsonHotIvt.getPoint_code());
param.put("material_code", container_name);
param.put("product_area", product_area);
param.put("request_param", NumberUtil.mul(Double.parseDouble(hours), 60));
@@ -292,7 +306,7 @@ public class BakingServiceImpl implements BakingService {
param.put("param", map);
// 创建冷却区 --> 暂存位的任务
InHotTask inHotTask = new InHotTask();
InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class);
String task_id = inHotTask.createTask(param);
// 4.插入烘箱区出入主表
@@ -326,12 +340,12 @@ public class BakingServiceImpl implements BakingService {
stIvtCoolregionio.setIostorinv_id(IdUtil.getSnowflake(1, 1).nextId() + "");
stIvtCoolregionio.setBill_code(CodeUtil.getNewCode("COOLREGION_BILL_CODE"));
stIvtCoolregionio.setIo_type("1");
stIvtCoolregionio.setMaterial_id(Long.getLong(jsonMater.getMaterial_id()));
stIvtCoolregionio.setMaterial_id(Long.parseLong(jsonMater.getMaterial_id()));
stIvtCoolregionio.setPcsn(container_name);
stIvtCoolregionio.setBill_status("50");
stIvtCoolregionio.setQty(jsonRaw.getProductin_qty());
stIvtCoolregionio.setTask_id(Long.getLong(task_id));
stIvtCoolregionio.setQty_unit_id(Long.getLong(jsonMater.getBase_unit_id()));
stIvtCoolregionio.setTask_id(Long.parseLong(task_id));
stIvtCoolregionio.setQty_unit_id(Long.parseLong(jsonMater.getBase_unit_id()));
stIvtCoolregionio.setStart_point_code(point_code1);
stIvtCoolregionio.setEnd_point_code(jsonHotIvt.getPoint_code());
stIvtCoolregionio.setCreate_mode("03");
@@ -360,7 +374,8 @@ public class BakingServiceImpl implements BakingService {
}
//查询该点位是否存在未完成的任务
boolean have_task = new CutConveyorTask().isSingleTask(point_code1);
CutConveyorTask cutConveyorTask = SpringContextHolder.getBean(CutConveyorTask.class);
boolean have_task = cutConveyorTask.isSingleTask(point_code1);
if (have_task) {
throw new BadRequestException("该点位存在未完成的任务！");
}
@@ -399,16 +414,25 @@ public class BakingServiceImpl implements BakingService {
map.put("point_location", jsonHotIvt.getPoint_location());
//只找出箱点位
map.put("point_type", "5");
//先查半区可用点，查任务数
List<SchBasePointDto> pointArr = schBasePointMapper.selectDjwPoints(map);
List<SchBasePoint> pointArr = schBasePointMapper.selectDjwPoints(map);
if (ObjectUtil.isEmpty(pointArr)) {
throw new BadRequestException("没有无货且没有任务的点位类型为出箱的烘箱对接位！");
}
//查任务数最少的点位
for (SchBasePointDto schBasePointDto : pointArr) {
Integer num = schBaseTaskMapper.selectTaskCount(schBasePointDto.getPoint_code());
schBasePointDto.setNum(num);
}
List<SchBasePointDto> sortPointArr = pointArr.stream().sorted(Comparator.comparingInt(SchBasePointDto::getNum)).collect(Collectors.toList());
// 2.判断暂存位是否有任务：找到无任务的暂存位
String point_code2 = "";
for (int i = 0; i < pointArr.size(); i++) {
SchBasePoint jsonPoint = pointArr.get(i);
for (int i = 0; i < sortPointArr.size(); i++) {
SchBasePoint jsonPoint = sortPointArr.get(i);
String point_code = jsonPoint.getPoint_code();
SchBaseTask json_point_code1 = schBaseTaskMapper.selectOne(new LambdaQueryWrapper<SchBaseTask>().eq(SchBaseTask::getPoint_code1, point_code).ne(SchBaseTask::getTask_status, "07").eq(SchBaseTask::getIs_delete, "0"));
@@ -430,7 +454,7 @@ public class BakingServiceImpl implements BakingService {
param.put("point_code2", point_code2);
param.put("material_code", jsonHotIvt.getContainer_name());
param.put("product_area", jsonHotIvt.getProduct_area());
OutHotTask outHotTask = new OutHotTask();
OutHotTask outHotTask = SpringContextHolder.getBean(OutHotTask.class);
String task_id = outHotTask.createTask(param);
RawfoilWorkOrder jsonRaw = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper<RawfoilWorkOrder>().eq(RawfoilWorkOrder::getContainer_name, jsonHotIvt.getContainer_name()).eq(RawfoilWorkOrder::getIs_delete, "0"));
@@ -457,12 +481,13 @@ public class BakingServiceImpl implements BakingService {
hotParam.put("start_point_code", point_code1);
hotParam.put("end_point_code", point_code2);
boolean exists = redisUtils.hHasKey(point_code1, "temperature");
String point_temperature = "";
if (exists) {
point_temperature = (String) redisUtils.hget(point_code1, "temperature");
} else {
throw new BadRequestException("当前操作点位设备:" + point_code1 + ",无法获取温度，请稍后再试!");
}
//烘箱测试
String point_temperature = "2";
// if (exists) {
// point_temperature = (String) redisUtils.hget(point_code1, "temperature");
// } else {
// throw new BadRequestException("当前操作点位设备:" + point_code1 + ",无法获取温度，请稍后再试!");
// }
hotParam.put("temperature", point_temperature);
if (ObjectUtil.isEmpty(last_hot_mst)) {
hotParam.put("oven_time", "480");
@@ -588,7 +613,7 @@ public class BakingServiceImpl implements BakingService {
param.put("product_area", jsonPointZc.getProduct_area());
param.put("request_param", NumberUtil.mul(Double.parseDouble(hours), 60));
InHotTask inHotTask = new InHotTask();
InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class);
String task_id = inHotTask.createTask(param);
// 3.插入主表
@@ -685,7 +710,7 @@ public class BakingServiceImpl implements BakingService {
param.put("param", map);
// 创建冷却区 --> 暂存位的任务
InHotTask inHotTask = new InHotTask();
InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class);
String task_id = inHotTask.createTask(param);
// 4.插入烘箱区出入主表
@@ -717,12 +742,12 @@ public class BakingServiceImpl implements BakingService {
jsonCool.setIostorinv_id(IdUtil.getSnowflake(1, 1).nextId() + "");
jsonCool.setBill_code(CodeUtil.getNewCode("COOLREGION_BILL_CODE"));
jsonCool.setIo_type("1");
jsonCool.setMaterial_id(Long.getLong(jsonMater.getMaterial_id()));
jsonCool.setMaterial_id(Long.parseLong(jsonMater.getMaterial_id()));
jsonCool.setPcsn(container_name);
jsonCool.setBill_status("50");
jsonCool.setQty(jsonRaw.getProductin_qty());
jsonCool.setQty_unit_id(Long.getLong(jsonMater.getBase_unit_id()));
jsonCool.setTask_id(Long.getLong(task_id));
jsonCool.setQty_unit_id(Long.parseLong(jsonMater.getBase_unit_id()));
jsonCool.setTask_id(Long.parseLong(task_id));
jsonCool.setStart_point_code(point_code1);
jsonCool.setEnd_point_code(jsonHotIvt.getPoint_code());
jsonCool.setCreate_mode("03");
@@ -750,11 +775,13 @@ public class BakingServiceImpl implements BakingService {
throw new BadRequestException("烘箱对接没有可用位置!");
}
JSONObject jsonMap = new JSONObject();
jsonMap.put("flag", "1");
jsonMap.put("product_area", product_area);
jsonMap.put("point_location", point_code2_jo.getPoint_location());
List<HotPointIvt> hot_rows = hotPointIvtMapper.selectHotPointList(jsonMap);
HotPointIvt jsonHotIvt = null;
//烘箱测试
HotPointIvt jsonHotIvt = hot_rows.get(0);
/**
for (int i = 0; i < hot_rows.size(); i++) {
HotPointIvt hot_row = hot_rows.get(i);
String point_code = hot_row.getPoint_code();
@@ -770,6 +797,7 @@ public class BakingServiceImpl implements BakingService {
}
}
}
**/
return jsonHotIvt;
}
@@ -856,7 +884,7 @@ public class BakingServiceImpl implements BakingService {
param.put("product_area", jsonPoint.getProduct_area());
InCoolIvtTask inCoolIvtTask = new InCoolIvtTask();
InCoolIvtTask inCoolIvtTask = SpringContextHolder.getBean(InCoolIvtTask.class);
String task_id = inCoolIvtTask.createTask(param);
// 生成冷却区出入表
@@ -873,12 +901,12 @@ public class BakingServiceImpl implements BakingService {
jsonCool.setIostorinv_id(IdUtil.getSnowflake(1, 1).nextId() + "");
jsonCool.setBill_code(CodeUtil.getNewCode("COOLREGION_BILL_CODE"));
jsonCool.setIo_type("0");
jsonCool.setMaterial_id(Long.getLong(jsonMater.getMaterial_id()));
jsonCool.setMaterial_id(Long.parseLong(jsonMater.getMaterial_id()));
jsonCool.setPcsn(container_name);
jsonCool.setBill_status("10");
jsonCool.setQty(jsonRaw.getProductin_qty());
jsonCool.setQty_unit_id(Long.getLong(jsonMater.getBase_unit_id()));
jsonCool.setTask_id(Long.getLong(task_id));
jsonCool.setQty_unit_id(Long.parseLong(jsonMater.getBase_unit_id()));
jsonCool.setTask_id(Long.parseLong(task_id));
jsonCool.setStart_point_code(point_code1);
jsonCool.setEnd_point_code(endPointCode);
jsonCool.setCreate_mode("03");
@@ -920,7 +948,7 @@ public class BakingServiceImpl implements BakingService {
hotRegionIoMst.setStart_point_code(param.getString("start_point_code"));
hotRegionIoMst.setEnd_point_code(param.getString("end_point_code"));
hotRegionIoMst.setCreate_mode("03");
hotRegionIoMst.setTask_id(Long.getLong(param.getString("task_id")));
hotRegionIoMst.setTask_id(Long.parseLong(param.getString("task_id")));
hotRegionIoMst.setTask_type(param.getString("task_type"));
hotRegionIoMst.setTemperature(param.getBigDecimal("temperature"));
hotRegionIoMst.setOven_time(param.getBigDecimal("oven_time"));
@@ -1046,7 +1074,7 @@ public class BakingServiceImpl implements BakingService {
String point_code1 = whereJson.getString("point_code"); // 点位
//查询该点位是否存在未完成的任务
List<SchBaseTask> hasTask = schBaseTaskMapper.selectList(new LambdaQueryWrapper<SchBaseTask>().eq(SchBaseTask::getPoint_code1, point_code1).lt(SchBaseTask::getTask_status, "07").eq(SchBaseTask::getIs_delete, "0"));
if (hasTask != null) {
if (!hasTask.isEmpty()) {
SchBaseTask schBaseTask = hasTask.get(0);
throw new BadRequestException("当前点位" + point_code1 + "存在正在执行的任务" + schBaseTask.getTask_code());
}
@@ -1134,7 +1162,7 @@ public class BakingServiceImpl implements BakingService {
param.put("product_area", jsonPointZc.getProduct_area());
param.put("request_param", NumberUtil.mul(Double.parseDouble(hours), 60));
InHotTask inHotTask = new InHotTask();
InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class);
String task_id = inHotTask.createTask(param);
// 3.插入主表
@@ -1231,7 +1259,7 @@ public class BakingServiceImpl implements BakingService {
param.put("request_param", "1");//1-不合格入冷却 2-合格入冷却
InCoolIvtTask inCoolIvtTask = new InCoolIvtTask();
InCoolIvtTask inCoolIvtTask = SpringContextHolder.getBean(InCoolIvtTask.class);
String task_id = inCoolIvtTask.createTask(param);
// 生成冷却区出入表
@@ -1248,12 +1276,12 @@ public class BakingServiceImpl implements BakingService {
jsonCool.setIostorinv_id(IdUtil.getSnowflake(1, 1).nextId() + "");
jsonCool.setBill_code(CodeUtil.getNewCode("COOLREGION_BILL_CODE"));
jsonCool.setIo_type("0");
jsonCool.setMaterial_id(Long.getLong(jsonMater.getMaterial_id()));
jsonCool.setMaterial_id(Long.parseLong(jsonMater.getMaterial_id()));
jsonCool.setPcsn(container_name);
jsonCool.setBill_status("10");
jsonCool.setQty(jsonRaw.getProductin_qty());
jsonCool.setQty_unit_id(Long.getLong(jsonMater.getBase_unit_id()));
jsonCool.setTask_id(Long.getLong(task_id));
jsonCool.setQty_unit_id(Long.parseLong(jsonMater.getBase_unit_id()));
jsonCool.setTask_id(Long.parseLong(task_id));
jsonCool.setStart_point_code(point_code1);
jsonCool.setEnd_point_code(endPointCode);
jsonCool.setCreate_mode("03");

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

@@ -42,6 +42,7 @@ import org.nl.wms.pdm.rawfoilworkorder.service.dao.mapper.SbPointIvtMapper;
import org.nl.wms.sch.manage.AbstractAcsTask;
import org.nl.wms.sch.tasks.CoolCutTask;
import org.nl.wms.sch.tasks.OutHotTask;
import org.nl.wms.st.outbill.service.CheckOutBillService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -73,6 +74,12 @@ public class FeedingServiceImpl implements FeedingService {
@Autowired
private SchBaseTaskMapper schBaseTaskMapper;
@Autowired
private CoolCutTask coolCutTask;
@Autowired
private CheckOutBillService checkOutBillService;
@Override
public JSONObject queryMaterialInfo(JSONObject whereJson, HttpContext ctx) {
@@ -171,13 +178,12 @@ public class FeedingServiceImpl implements FeedingService {
throw new BadRequestException("当前登录人员暂无【" + cool_jo.getProduct_area() + "】操作权限");
}
}
String point_code = cool_jo.getPoint_code();
if (!StrUtil.equals(cool_jo.getFull_point_status(), "02")) {
throw new BadRequestException("该点位上不存在母卷！");
}
if (!StrUtil.equals(cool_jo.getContainer_name(), container_name)) {
throw new BadRequestException("该点位:" + point_code + "不存在母卷:" + container_name);
throw new BadRequestException("该点位:" + cool_jo.getFull_point_code() + "不存在母卷:" + container_name);
}
JSONObject result = new JSONObject();
result.put("message", "操作成功!");
@@ -187,14 +193,14 @@ public class FeedingServiceImpl implements FeedingService {
throw new BadRequestException("该分切机对应的上料位存在母卷，不能下发搬运任务！");
}
if (StrUtil.equals("01", cut_jo.getEmpty_point_status())) {
jo.put("point_code1", point_code);
jo.put("point_code2", next_point_code);
jo.put("point_code1", cool_jo.getFull_point_code());
jo.put("point_code2", cut_jo.getFull_point_code());
jo.put("vehicle_code", cool_jo.getContainer_name());
jo.put("product_area", cut_jo.getProduct_area());
jo.put("task_type", "010302");
} else {
jo.put("point_code1", point_code);
jo.put("point_code2", next_point_code);
jo.put("point_code1", cool_jo.getFull_point_code());
jo.put("point_code2", cut_jo.getFull_point_code());
jo.put("point_code3", cut_jo.getEmpty_point_code());
jo.put("point_code4", cool_jo.getEmpty_point_code());
jo.put("vehicle_code", cool_jo.getContainer_name());
@@ -226,11 +232,11 @@ public class FeedingServiceImpl implements FeedingService {
jsonCool.setIostorinv_id(IdUtil.getSnowflake(1, 1).nextId() + "");
jsonCool.setBill_code(CodeUtil.getNewCode("COOLREGION_BILL_CODE"));
jsonCool.setIo_type("1");
jsonCool.setMaterial_id(Long.getLong(mater_jo.getMaterial_id()));
jsonCool.setMaterial_id(Long.parseLong(mater_jo.getMaterial_id()));
jsonCool.setPcsn(cool_jo.getContainer_name());
jsonCool.setBill_status("50");
jsonCool.setQty_unit_id(Long.getLong("1"));
jsonCool.setTask_id(Long.getLong(task_id));
jsonCool.setQty_unit_id(Long.parseLong("1"));
jsonCool.setTask_id(Long.parseLong(task_id));
jsonCool.setStart_point_code(cool_jo.getFull_point_code());
jsonCool.setEnd_point_code(cut_jo.getFull_point_code());
jsonCool.setCreate_mode("03");
@@ -291,8 +297,7 @@ public class FeedingServiceImpl implements FeedingService {
param.put("point_code2", jsonCooIvt.getEmpty_point_code());
param.put("product_area", cut_jo.getProduct_area());
param.put("task_type", "010303");
AbstractAcsTask task = new CoolCutTask();
task.createTask(param);
coolCutTask.createTask(param);
}
//满轴送回
@@ -339,8 +344,7 @@ public class FeedingServiceImpl implements FeedingService {
param.put("product_area", cut_jo.getProduct_area());
param.put("vehicle_code", container_name);
param.put("task_type", "010304");
AbstractAcsTask task = new CoolCutTask();
task.createTask(param);
coolCutTask.createTask(param);
}
@@ -383,4 +387,6 @@ public class FeedingServiceImpl implements FeedingService {
jo.put("message", "操作成功!");
return jo;
}
}

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

@@ -166,10 +166,10 @@ public class RawFoilServiceImpl implements RawFoilService {
@Override
public JSONObject queryRawFoilList(JSONObject whereJson, HttpContext ctx) {
PageHelper.startPage(Integer.parseInt(ctx.getPage()), Integer.parseInt(ctx.getRows()));
// PageHelper.startPage(Integer.parseInt(ctx.getPage()), Integer.parseInt(ctx.getRows()));
JSONObject map = new JSONObject();
map.put("point_code", whereJson.getString("point_code"));
map.put("container_name", whereJson.getString("container_name"));
// map.put("container_name", whereJson.getString("container_name"));
map.put("product_area", whereJson.getString("product_area"));
//获取人员对应的区域
UserAreaServiceImpl userAreaService = new UserAreaServiceImpl();
@@ -251,15 +251,22 @@ public class RawFoilServiceImpl implements RawFoilService {
public JSONObject confirmBlanking(JSONObject whereJson) {
String point_code = whereJson.getString("point_code");
//查询该点位对应的任务
JSONObject task_jo = WQLObject.getWQLObject("SCH_BASE_Task").query("point_code1 = '" + point_code + "' OR point_code2 = '" + point_code + "' OR point_code3 = '" + point_code + "' OR point_code4 = '" + point_code + "' and task_status <> '07' AND is_delete = '0'").uniqueResult(0);
JSONObject raw_jo = whereJson.getJSONObject("raw_jo");
RawfoilWorkOrder rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper<RawfoilWorkOrder>()
.eq(RawfoilWorkOrder::getWorkorder_id, raw_jo.getString("workorder_id")));
if (!rawfoilWorkOrder.getStatus().equals("02")){
throw new BadRequestException("工单状态不为空轴搬出");
}
//查询该母卷号对应的任务
String container_name = rawfoilWorkOrder.getContainer_name();
JSONObject task_jo = WQLObject.getWQLObject("SCH_BASE_Task").query("material_code = '" + container_name + "' and task_status <> '07' AND is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(task_jo)) {
throw new BadRequestException("点位编码【" + point_code + "】的任务不存在！");
throw new BadRequestException("当前母卷AGV搬运任务不存在或已被强制完成！");
}
// 查询生箔点位库存表
SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper<SbPointIvt>()
.eq(SbPointIvt::getPoint_code, point_code.substring(0, point_code.length()-2)));
.eq(SbPointIvt::getExt_code, rawfoilWorkOrder.getResource_name()));
if (ObjectUtil.isEmpty(stIvtSbpointivt)) {
throw new BadRequestException("点位设备不存在");
}
@@ -280,6 +287,10 @@ public class RawFoilServiceImpl implements RawFoilService {
throw new BadRequestException("操作失败：" + result.getString("message "));
}
// 更新工单状态为确认下卷
rawfoilWorkOrder.setStatus("03");
rawfoilWorkOrderMapper.updateById(rawfoilWorkOrder);
JSONObject jo = new JSONObject();
jo.put("message", "操作成功!");
return jo;
@@ -288,37 +299,74 @@ public class RawFoilServiceImpl implements RawFoilService {
@Override
@Transactional(rollbackFor = Exception.class)
public JSONObject scrollDowm(JSONObject whereJson) {
public JSONObject needEmptyAxis(JSONObject whereJson) {
String message = "操作完成！";
String type = whereJson.getString("type");
JSONObject raw_jo = whereJson.getJSONObject("raw_jo");
String point_code = whereJson.getString("point_code");
JSONObject param = new JSONObject();
if ("1".equals(type) || "3".equals(type)) {// 1：取空取满放空放满，
handleType1And3(raw_jo, param, type);
} else if ("2".equals(type)) {//2：单上空轴
handleType2(point_code, param);
} else if ("4".equals(type)) {//4：单下空轴
handleType4(point_code, param);
}
CallEmpReelTask callEmpReelTask = new CallEmpReelTask();
callEmpReelTask.createTask(param);
// 更新工单状态
if ("1".equals(type) || "3".equals(type)) {
if (ObjectUtil.isEmpty(raw_jo)) {
throw new BadRequestException("生箔工单不能为空！");
}
SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper<SbPointIvt>()
.eq(ObjectUtil.isNotEmpty(raw_jo.getString("point_code")), SbPointIvt::getPoint_code, raw_jo.getString("point_code")));
if (ObjectUtil.isEmpty(stIvtSbpointivt)) {
throw new BadRequestException("点位：" + stIvtSbpointivt.getExt_code() + "生箔设备不存在");
}
if (StrUtil.equals("0", stIvtSbpointivt.getIs_used())) {
throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "未启用！");
}
JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("material_code = '" + raw_jo.getString("container_name") + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(task_jo)) {
throw new BadRequestException("该生箔工单存在未完成的任务，请先完成任务！");
}
RawfoilWorkOrder rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper<RawfoilWorkOrder>()
.eq(ObjectUtil.isNotEmpty(raw_jo.getString("workorder_id")), RawfoilWorkOrder::getWorkorder_id, raw_jo.getString("workorder_id")));
rawfoilWorkOrder.setStatus("10");
if (!StrUtil.equals(rawfoilWorkOrder.getStatus(), "01")) {
throw new BadRequestException("工单状态不为开始");
}
JSONObject map = new JSONObject();
map.put("product_area", stIvtSbpointivt.getProduct_area());
map.put("point_location", stIvtSbpointivt.getPoint_location());
map.put("point_type", "1");
map.put("empty_point_status", "02");
map.put("full_point_status", "01");
List<CoolPointIvt> coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map);
//如果没找到则继续找下一节点
if (CollectionUtil.isEmpty(coolPointIvtList)) {
String point_location = stIvtSbpointivt.getPoint_location();
if (StrUtil.equals(point_location, "0")) map.put("point_location", "1");
if (StrUtil.equals(point_location, "1")) map.put("point_location", "0");
coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map);
if (CollectionUtil.isEmpty(coolPointIvtList)) {
throw new BadRequestException("未查询到合适的冷却区点位");
}
}
CoolPointIvt jsonIvt = coolPointIvtList.get(0);
param.put("point_code1", jsonIvt.getEmpty_point_code());
param.put("point_code2", stIvtSbpointivt.getEmpty_point_code());
param.put("point_code3", stIvtSbpointivt.getFull_point_code());
param.put("point_code4", jsonIvt.getFull_point_code());
param.put("task_type", "010101");
param.put("material_code", rawfoilWorkOrder.getContainer_name());
param.put("product_area", rawfoilWorkOrder.getProduct_area());
CallEmpReelTask callEmpReelTask = SpringContextHolder.getBean(CallEmpReelTask.class);
callEmpReelTask.createTask(param);
// 更新工单状态
rawfoilWorkOrder.setStatus("02");
rawfoilWorkOrder.setUpdate_time(DateUtil.now());
rawfoilWorkOrderMapper.updateById(rawfoilWorkOrder);
}
JSONObject jo = new JSONObject();
jo.put("message", message);
return jo;
}
@Override
public JSONObject scrollDowmTest(JSONObject whereJson) {
public JSONObject needEmptyAxisTest(JSONObject whereJson) {
SbPointIvt sbPointIvt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper<SbPointIvt>().eq(ObjectUtil.isNotEmpty(whereJson.getString("point_code")), SbPointIvt::getPoint_code, whereJson.getString("point_code")));
if (ObjectUtil.isEmpty(sbPointIvt)) {
throw new BadRequestException("点位设备不存在");
@@ -335,9 +383,9 @@ public class RawFoilServiceImpl implements RawFoilService {
rawfoilWorkOrder.setUp_coiler_date(DateUtil.now());
rawfoilWorkOrder.setIs_reload_send("0");
rawfoilWorkOrder.setOrder_type("2");
rawfoilWorkOrder.setProduct_area("B2");
rawfoilWorkOrder.setProduct_area("A4");
rawfoilWorkOrder.setRealstart_time(DateUtil.now());
rawfoilWorkOrder.setStatus("00");
rawfoilWorkOrder.setStatus("01");
rawfoilWorkOrder.setIs_delete("0");
rawfoilWorkOrder.setAgvno("0");
rawfoilWorkOrder.setProductin_qty(BigDecimal.valueOf(0));
@@ -406,52 +454,49 @@ public class RawFoilServiceImpl implements RawFoilService {
}
}
private void handleType1And3(JSONObject raw_jo, JSONObject param, String type) {
if (ObjectUtil.isEmpty(raw_jo)) {
throw new BadRequestException("生箔工单不能为空！");
}
SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper<SbPointIvt>()
.eq(ObjectUtil.isNotEmpty(raw_jo.getString("point_code")), SbPointIvt::getPoint_code, raw_jo.getString("point_code")));
if (ObjectUtil.isEmpty(stIvtSbpointivt)) {
throw new BadRequestException("点位：" + stIvtSbpointivt.getExt_code() + "生箔设备不存在");
}
if (StrUtil.equals("0", stIvtSbpointivt.getIs_used())) {
throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "未启用！");
}
JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("material_code = '" + raw_jo.getString("container_name") + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isNotEmpty(task_jo)) {
throw new BadRequestException("该生箔工单存在未完成的任务，请先完成任务！");
}
RawfoilWorkOrder rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper<RawfoilWorkOrder>()
.eq(ObjectUtil.isNotEmpty(raw_jo.getString("workorder_id")), RawfoilWorkOrder::getWorkorder_id, raw_jo.getString("workorder_id")));
if (!StrUtil.equals(rawfoilWorkOrder.getStatus(), "30")) {
throw new BadRequestException("工单状态不为开始生产");
}
if (StrUtil.equals("02", stIvtSbpointivt.getFull_point_status()) && StrUtil.equals("01", stIvtSbpointivt.getEmpty_point_status())) {
JSONObject map = new JSONObject();
map.put("product_area", stIvtSbpointivt.getProduct_area());
map.put("point_location", stIvtSbpointivt.getPoint_location());
map.put("point_type", "1");
if ("1".equals(type)) {
map.put("empty_point_status", "02");
map.put("full_point_status", "01");
} else {
map.put("empty_point_status", "01");
map.put("full_point_status", "01");
}
List<CoolPointIvt> coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map);
String start_pint_code = "";
String next_pint_code = "";
String point_code4 = "";
CoolPointIvt jsonIvt;
//如果没找到则继续找下一节点
if (CollectionUtil.isEmpty(coolPointIvtList)) {
// adjustPointLocation(map, stIvtSbpointivt);
// coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map);
// if (CollectionUtil.isEmpty(coolPointIvtList)) {
// throw new BadRequestException("未查询到合适的点位");
// private void handleType1And3(JSONObject raw_jo, JSONObject param, String type) {
// if (ObjectUtil.isEmpty(raw_jo)) {
// throw new BadRequestException("生箔工单不能为空！");
// }
// SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper<SbPointIvt>()
// .eq(ObjectUtil.isNotEmpty(raw_jo.getString("point_code")), SbPointIvt::getPoint_code, raw_jo.getString("point_code")));
// if (ObjectUtil.isEmpty(stIvtSbpointivt)) {
// throw new BadRequestException("点位：" + stIvtSbpointivt.getExt_code() + "生箔设备不存在");
// }
// if (StrUtil.equals("0", stIvtSbpointivt.getIs_used())) {
// throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "未启用！");
// }
// JSONObject task_jo = WQLObject.getWQLObject("sch_base_task").query("material_code = '" + raw_jo.getString("container_name") + "' AND task_status < '07' AND is_delete = '0'").uniqueResult(0);
// if (ObjectUtil.isNotEmpty(task_jo)) {
// throw new BadRequestException("该生箔工单存在未完成的任务，请先完成任务！");
// }
// RawfoilWorkOrder rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper<RawfoilWorkOrder>()
// .eq(ObjectUtil.isNotEmpty(raw_jo.getString("workorder_id")), RawfoilWorkOrder::getWorkorder_id, raw_jo.getString("workorder_id")));
// if (!StrUtil.equals(rawfoilWorkOrder.getStatus(), "01")) {
// throw new BadRequestException("工单状态不为开始");
// }
// if (StrUtil.equals("02", stIvtSbpointivt.getFull_point_status()) && StrUtil.equals("01", stIvtSbpointivt.getEmpty_point_status())) {
// JSONObject map = new JSONObject();
// map.put("product_area", stIvtSbpointivt.getProduct_area());
// map.put("point_location", stIvtSbpointivt.getPoint_location());
// map.put("point_type", "1");
// if ("1".equals(type)) {
// map.put("empty_point_status", "02");
// map.put("full_point_status", "01");
// } else {
// map.put("empty_point_status", "01");
// map.put("full_point_status", "01");
// }
// List<CoolPointIvt> coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map);
//
// String start_pint_code = "";
// String next_pint_code = "";
// String point_code4 = "";
// CoolPointIvt jsonIvt;
// //如果没找到则继续找下一节点
// if (CollectionUtil.isEmpty(coolPointIvtList)) {
// throw new BadRequestException("未查询到合适的冷却区点位");
// } else {
// jsonIvt = coolPointIvtList.get(0);
// if ("1".equals(type)) {
// start_pint_code = jsonIvt.getEmpty_point_code();
@@ -459,140 +504,130 @@ public class RawFoilServiceImpl implements RawFoilService {
// } else {
// next_pint_code = jsonIvt.getFull_point_code();
// }
throw new BadRequestException("未查询到合适的冷却区点位");
} else {
jsonIvt = coolPointIvtList.get(0);
if ("1".equals(type)) {
start_pint_code = jsonIvt.getEmpty_point_code();
point_code4 = jsonIvt.getFull_point_code();
} else {
next_pint_code = jsonIvt.getFull_point_code();
}
}
if ("1".equals(type)) {
param.put("point_code1", start_pint_code);
param.put("point_code2", stIvtSbpointivt.getEmpty_point_code());
param.put("point_code3", stIvtSbpointivt.getFull_point_code());
param.put("point_code4", point_code4);
param.put("task_type", "010101");
} else {
param.put("point_code1", stIvtSbpointivt.getFull_point_code());
param.put("point_code2", next_pint_code);
param.put("task_type", "010102");
}
param.put("material_code", rawfoilWorkOrder.getContainer_name());
param.put("product_area", rawfoilWorkOrder.getProduct_area());
} else {
throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "不为有满卷且空轴位为空的状态！");
}
}
private void handleType2(String point_code, JSONObject param) {
if (ObjectUtil.isEmpty(point_code)) {
throw new BadRequestException("点位不能为空！");
}
SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper<SbPointIvt>()
.eq(SbPointIvt::getPoint_code, point_code));
if (ObjectUtil.isEmpty(stIvtSbpointivt)) {
throw new BadRequestException("点位：" + stIvtSbpointivt.getExt_code() + "生箔设备不存在");
}
if (StrUtil.equals("0", stIvtSbpointivt.getIs_used())) {
throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "未启用！");
}
if (StrUtil.equals("01", stIvtSbpointivt.getEmpty_point_status()) && StrUtil.equals("01", stIvtSbpointivt.getFull_point_status())) {
JSONObject map = new JSONObject();
map.put("product_area", stIvtSbpointivt.getProduct_area());
map.put("point_location", stIvtSbpointivt.getPoint_location());
map.put("empty_point_status", "02");
map.put("full_point_status", "01");
List<CoolPointIvt> coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map);
String start_pint_code = "";
//如果没找到则继续找下一节点
CoolPointIvt jsonIvt;
if (ObjectUtil.isEmpty(coolPointIvtList)) {
// adjustPointLocation(map, stIvtSbpointivt);
// coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map);
// if (CollectionUtil.isEmpty(coolPointIvtList)) {
// throw new BadRequestException("未查询到合适的点位");
// }
//
// if ("1".equals(type)) {
// param.put("point_code1", start_pint_code);
// param.put("point_code2", stIvtSbpointivt.getEmpty_point_code());
// param.put("point_code3", stIvtSbpointivt.getFull_point_code());
// param.put("point_code4", point_code4);
// param.put("task_type", "010101");
// } else {
// param.put("point_code1", stIvtSbpointivt.getFull_point_code());
// param.put("point_code2", next_pint_code);
// param.put("task_type", "010102");
// }
//
// param.put("material_code", rawfoilWorkOrder.getContainer_name());
// param.put("product_area", rawfoilWorkOrder.getProduct_area());
// } else {
// throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "不为有满卷且空轴位为空的状态！");
// }
// }
//
// private void handleType2(String point_code, JSONObject param) {
// if (ObjectUtil.isEmpty(point_code)) {
// throw new BadRequestException("点位不能为空！");
// }
// SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper<SbPointIvt>()
// .eq(SbPointIvt::getPoint_code, point_code));
// if (ObjectUtil.isEmpty(stIvtSbpointivt)) {
// throw new BadRequestException("点位：" + stIvtSbpointivt.getExt_code() + "生箔设备不存在");
// }
// if (StrUtil.equals("0", stIvtSbpointivt.getIs_used())) {
// throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "未启用！");
// }
// if (StrUtil.equals("01", stIvtSbpointivt.getEmpty_point_status()) && StrUtil.equals("01", stIvtSbpointivt.getFull_point_status())) {
// JSONObject map = new JSONObject();
// map.put("product_area", stIvtSbpointivt.getProduct_area());
// map.put("point_location", stIvtSbpointivt.getPoint_location());
// map.put("empty_point_status", "02");
// map.put("full_point_status", "01");
// List<CoolPointIvt> coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map);
// String start_pint_code = "";
// //如果没找到则继续找下一节点
// CoolPointIvt jsonIvt;
// if (ObjectUtil.isEmpty(coolPointIvtList)) {
//// adjustPointLocation(map, stIvtSbpointivt);
//// coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map);
//// if (CollectionUtil.isEmpty(coolPointIvtList)) {
//// throw new BadRequestException("未查询到合适的点位");
//// }
//// jsonIvt = coolPointIvtList.get(0);
//// start_pint_code = jsonIvt.getEmpty_point_code();
// throw new BadRequestException("未查询到合适的冷却区点位");
// } else {
// jsonIvt = coolPointIvtList.get(0);
// start_pint_code = jsonIvt.getEmpty_point_code();
throw new BadRequestException("未查询到合适的冷却区点位");
} else {
jsonIvt = coolPointIvtList.get(0);
start_pint_code = jsonIvt.getEmpty_point_code();
}
param.put("point_code1", start_pint_code);
param.put("point_code2", stIvtSbpointivt.getEmpty_point_code());
param.put("task_type", "010103");
param.put("product_area", jsonIvt.getProduct_area());
} else {
throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "空轴位或者满轴位不为空！");
}
}
private void handleType4(String point_code, JSONObject param) {
if (ObjectUtil.isEmpty(point_code)) {
throw new BadRequestException("点位不能为空！");
}
SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper<SbPointIvt>()
.eq(SbPointIvt::getPoint_code, point_code));
if (ObjectUtil.isEmpty(stIvtSbpointivt)) {
throw new BadRequestException("点位：" + stIvtSbpointivt.getExt_code() + "生箔设备不存在");
}
if (StrUtil.equals("0", stIvtSbpointivt.getIs_used())) {
throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "未启用！");
}
List<RawfoilWorkOrder> rawfoilWorkOrderList = rawfoilWorkOrderMapper.selectList(new LambdaQueryWrapper<RawfoilWorkOrder>()
.eq(ObjectUtil.isNotEmpty(stIvtSbpointivt.getExt_code()), RawfoilWorkOrder::getResource_name, stIvtSbpointivt.getExt_code())
.eq(RawfoilWorkOrder::getStatus, "30"));
if (rawfoilWorkOrderList.size() > 0) {
throw new BadRequestException("该机台已经存在开始生产的工单，请先维护再重试！");
}
if (StrUtil.equals("02", stIvtSbpointivt.getEmpty_point_status()) && StrUtil.equals("01", stIvtSbpointivt.getFull_point_status())) {
JSONObject map = new JSONObject();
map.put("product_area", stIvtSbpointivt.getProduct_area());
map.put("point_location", stIvtSbpointivt.getPoint_location());
map.put("empty_point_status", "01");
map.put("full_point_status", "01");
List<CoolPointIvt> coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map);
String next_pint_code = "";
CoolPointIvt jsonIvt;
//如果没找到则继续找下一节点
if (CollectionUtil.isEmpty(coolPointIvtList)) {
// adjustPointLocation(map, stIvtSbpointivt);
// coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map);
// if (CollectionUtil.isEmpty(coolPointIvtList)) {
// throw new BadRequestException("未查询到合适的点位");
// }
// param.put("point_code1", start_pint_code);
// param.put("point_code2", stIvtSbpointivt.getEmpty_point_code());
// param.put("task_type", "010103");
// param.put("product_area", jsonIvt.getProduct_area());
// } else {
// throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "空轴位或者满轴位不为空！");
// }
// }
//
// private void handleType4(String point_code, JSONObject param) {
// if (ObjectUtil.isEmpty(point_code)) {
// throw new BadRequestException("点位不能为空！");
// }
// SbPointIvt stIvtSbpointivt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper<SbPointIvt>()
// .eq(SbPointIvt::getPoint_code, point_code));
// if (ObjectUtil.isEmpty(stIvtSbpointivt)) {
// throw new BadRequestException("点位：" + stIvtSbpointivt.getExt_code() + "生箔设备不存在");
// }
// if (StrUtil.equals("0", stIvtSbpointivt.getIs_used())) {
// throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "未启用！");
// }
// List<RawfoilWorkOrder> rawfoilWorkOrderList = rawfoilWorkOrderMapper.selectList(new LambdaQueryWrapper<RawfoilWorkOrder>()
// .eq(ObjectUtil.isNotEmpty(stIvtSbpointivt.getExt_code()), RawfoilWorkOrder::getResource_name, stIvtSbpointivt.getExt_code())
// .eq(RawfoilWorkOrder::getStatus, "30"));
// if (rawfoilWorkOrderList.size() > 0) {
// throw new BadRequestException("该机台已经存在开始生产的工单，请先维护再重试！");
// }
//
// if (StrUtil.equals("02", stIvtSbpointivt.getEmpty_point_status()) && StrUtil.equals("01", stIvtSbpointivt.getFull_point_status())) {
// JSONObject map = new JSONObject();
// map.put("product_area", stIvtSbpointivt.getProduct_area());
// map.put("point_location", stIvtSbpointivt.getPoint_location());
// map.put("empty_point_status", "01");
// map.put("full_point_status", "01");
// List<CoolPointIvt> coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map);
//
// String next_pint_code = "";
// CoolPointIvt jsonIvt;
// //如果没找到则继续找下一节点
// if (CollectionUtil.isEmpty(coolPointIvtList)) {
//// adjustPointLocation(map, stIvtSbpointivt);
//// coolPointIvtList = coolPointIvtMapper.queryCoolPointIvt(map);
//// if (CollectionUtil.isEmpty(coolPointIvtList)) {
//// throw new BadRequestException("未查询到合适的点位");
//// }
//// jsonIvt = coolPointIvtList.get(0);
//// next_pint_code = jsonIvt.getEmpty_point_code();
// throw new BadRequestException("未查询到合适的冷却区点位");
// } else {
// jsonIvt = coolPointIvtList.get(0);
// next_pint_code = jsonIvt.getEmpty_point_code();
throw new BadRequestException("未查询到合适的冷却区点位");
} else {
jsonIvt = coolPointIvtList.get(0);
next_pint_code = jsonIvt.getEmpty_point_code();
}
param.put("point_code1", stIvtSbpointivt.getEmpty_point_code());
param.put("point_code2", next_pint_code);
param.put("task_type", "010104");
param.put("product_area", jsonIvt.getProduct_area());
} else {
throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "不是满轴位为空且空轴位不为空的状态！");
}
}
private void adjustPointLocation(JSONObject map, SbPointIvt stIvtSbpointivt) {
String point_location = stIvtSbpointivt.getPoint_location();
if (StrUtil.equals(point_location, "0")) {
map.put("point_location", "1");
} else if (StrUtil.equals(point_location, "1")) {
map.put("point_location", "0");
}
}
// }
//
// param.put("point_code1", stIvtSbpointivt.getEmpty_point_code());
// param.put("point_code2", next_pint_code);
// param.put("task_type", "010104");
// param.put("product_area", jsonIvt.getProduct_area());
// } else {
// throw new BadRequestException("当前生箔机：" + stIvtSbpointivt.getExt_code() + "不是满轴位为空且空轴位不为空的状态！");
// }
// }
//
// private void adjustPointLocation(JSONObject map, SbPointIvt stIvtSbpointivt) {
// String point_location = stIvtSbpointivt.getPoint_location();
// if (StrUtil.equals(point_location, "0")) {
// map.put("point_location", "1");
// } else if (StrUtil.equals(point_location, "1")) {
// map.put("point_location", "0");
// }
// }
}

23
lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/CoolPointIvtMapper.xml
View File

@@ -107,17 +107,14 @@
AND full_point_status = '01'
AND empty_point_status = '01'
<!-- 动态条件：point_type 不为空时查询对应值 -->
<if test="point_type != null and point_type != ''">
AND point_type = #{point_type}
<if test="param.point_type != null and param.point_type != ''">
AND point_type = #{param.point_type}
</if>
<!-- 动态条件：point_type 为空时默认为 '1' -->
<if test="point_type == null or point_type == ''">
<if test="param.point_type == null or param.point_type == ''">
AND point_type = '1'
</if>
<!-- 检查不存在关联任务 -->
AND NOT EXISTS (
SELECT 1
FROM sch_base_task
@@ -127,19 +124,17 @@
AND is_delete = '0'
)
<!-- product_area 不为空时添加条件 -->
<if test="product_area != null and product_area != ''">
AND product_area = #{product_area}
<if test="param.product_area != null and param.product_area != ''">
AND product_area = #{param.product_area}
</if>
<!-- point_location 不为空时添加条件 -->
<if test="point_location != null and point_location != ''">
AND point_location = #{point_location}
<if test="param.point_location != null and param.point_location != ''">
AND point_location = #{param.point_location}
</if>
ORDER BY sort_seq DESC
</select>
<select id="selectCoolPoints" resultType="org.nl.wms.pdm.rawfoilworkorder.service.dao.CoolPointIvt">
<select id="selectCoolPoints" resultType="org.nl.wms.pdm.rawfoilworkorder.service.dao.CoolPointIvt" parameterType="com.alibaba.fastjson.JSONObject">
SELECT
*
FROM
@@ -169,7 +164,7 @@
)
<if test="param.product_area != null and param.product_area != ''">
AND product_area = #{product_area}
AND product_area = #{param.product_area}
</if>
<if test="param.point_location != null and param.point_location != ''">

4
lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/HotPointIvtMapper.xml
View File

@@ -13,7 +13,7 @@
OR point_code1 = ivt.point_code
OR point_code2 = ivt.point_code
OR point_code4 = ivt.point_code)
AND task_status <![CDATA[<]]>] '07'
AND task_status <![CDATA[<]]> '07'
AND is_delete = '0'
)
<if test="jsonMap.getString('product_area') != null and jsonMap.getString('product_area') != ''">
@@ -35,7 +35,7 @@
SELECT *
FROM sch_base_task
WHERE (point_code3 = ivt.point_code OR point_code1 = ivt.point_code OR point_code2 = ivt.point_code OR point_code4 = ivt.point_code)
AND task_status <![CDATA[<]]>] '07'
AND task_status <![CDATA[<]]> '07'
AND is_delete = '0'
)
<if test="param.product_area != null and param.product_area != ''">

15
lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/dao/mapper/RawfoilWorkOrderMapper.xml
View File

@@ -33,8 +33,7 @@
PDM_BI_RawFoilWorkOrder der
LEFT JOIN st_ivt_sbpointivt sb ON sb.ext_code = der.resource_name
WHERE
der.status = '00'
OR der.status = '10'
der.status = '01'
AND der.is_delete = '0'
AND sb.product_area IN
<foreach collection="areas" item="areaId" open="(" separator="," close=")">
@@ -49,15 +48,17 @@
<if test="map.getString('product_area') != null and map.getString('product_area') != ''">
AND der.product_area = #{map.product_area}
</if>
order by der.container_name
</select>
<select id="queryRawFoilList" resultType="org.nl.wms.pdm.rawfoilworkorder.service.dto.RawfoilWorkOrderDto"
parameterType="com.alibaba.fastjson.JSONObject">
SELECT
CASE der.status
WHEN '00' THEN '初始化'
WHEN '10' THEN '配送中'
WHEN '30' THEN '开始生产'
WHEN '40' THEN '结束'
WHEN '01' THEN '开始'
WHEN '02' THEN '空轴搬出'
WHEN '03' THEN '准备就绪'
WHEN '04' THEN '下卷完成'
WHEN '09' THEN '结束'
END AS status_name,
der.mfg_order_name AS mfg_order_name,
der.container_name AS container_name,
@@ -77,7 +78,7 @@
LEFT JOIN st_ivt_sbpointivt ivt ON ivt.ext_code = der.resource_name
WHERE
der.is_delete = '0'
AND der.status != '40'
AND der.status != '09'
AND ivt.product_area IN
<foreach collection="areas" item="areaId" open="(" separator="," close=")">
#{areaId}

4
lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/impl/RawfoilWorkOrderServiceImpl.java
View File

@@ -138,7 +138,7 @@ public class RawfoilWorkOrderServiceImpl extends ServiceImpl<RawfoilWorkOrderMap
dto.setAgvno("0");
dto.setIs_delete("0");
dto.setRealstart_time(DateUtil.now());
dto.setStatus("00");
dto.setStatus("01");
if (ObjectUtil.isEmpty(dto.getProductin_qty())) {
dto.setProductin_qty(BigDecimal.valueOf(0));
}
@@ -235,7 +235,7 @@ public class RawfoilWorkOrderServiceImpl extends ServiceImpl<RawfoilWorkOrderMap
RawfoilWorkOrder rawfoilWorkOrder = new RawfoilWorkOrder();
rawfoilWorkOrder.setWorkorder_id(whereJson.getLong("workorder_id"));
rawfoilWorkOrder.setStatus("40");
rawfoilWorkOrder.setStatus("09");
rawfoilWorkOrder.setFinish_type("02");
rawfoilWorkOrder.setRealend_time(DateUtil.now());
rawfoilWorkOrder.setUpdate_optid(currentUserId);

2
lms/nladmin-system/src/main/java/org/nl/wms/pdm/rawfoilworkorder/service/impl/SbPointIvtServiceImpl.java
View File

@@ -47,7 +47,7 @@ public class SbPointIvtServiceImpl extends ServiceImpl<SbPointIvtMapper, SbPoint
wrapper.like(ObjectUtil.isNotEmpty(whereJson.get("point_code")), SbPointIvt::getPoint_code, whereJson.get("point_code"));
wrapper.eq(ObjectUtil.isNotEmpty(whereJson.get("product_area")), SbPointIvt::getProduct_area, whereJson.get("product_area"));
wrapper.eq(ObjectUtil.isNotEmpty(whereJson.get("is_used")), SbPointIvt::getIs_used, whereJson.get("is_used"));
wrapper.like(ObjectUtil.isNotEmpty(whereJson.get("search")), SbPointIvt::getPoint_code, whereJson.get("search"));
wrapper.like(ObjectUtil.isNotEmpty(whereJson.get("mes_used")), SbPointIvt::getPoint_code, whereJson.get("mes_used"));
// wrapper.in(ObjectUtil.isNotEmpty(in_area_id), SbPointIvt::getProduct_area, in_area_id);
IPage<SbPointIvt> pages = new Page<>(page.getOffset() + 1, page.getPageSize());
IPage<SbPointIvt> sbPointIvtList = sbPointIvtMapper.selectPage(pages, wrapper);

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

@@ -13,6 +13,7 @@ import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.common.utils.RedisUtils;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.sch.tasks.InHotTask;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
@@ -42,7 +43,7 @@ public class AutoInHotTask {
try {
if (tryLock) {
List<SchBaseTask> tasks = taskService.list(new LambdaQueryWrapper<SchBaseTask>()
.eq(SchBaseTask::getTask_type, "010201")
.eq(SchBaseTask::getTask_type, "010206")
.eq(SchBaseTask::getIs_delete, "0")
.eq(SchBaseTask::getTask_status, TaskStatusEnum.SURE_START.getCode()));
for (SchBaseTask task : tasks) {
@@ -87,7 +88,8 @@ public class AutoInHotTask {
task.setRemark("-");
task.setUpdate_time(DateUtil.now());
taskService.updateById(task);
new InHotTask().immediateNotifyAcs(task.getTask_id());
InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class);
inHotTask.immediateNotifyAcs(task.getTask_id());
}
public JSONObject getJsonObject(String product_area, JSONObject point_code2_jo, String temperature) {

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

@@ -9,6 +9,7 @@ import lombok.extern.slf4j.Slf4j;
import org.nl.b_lms.sch.task.dao.SchBaseTask;
import org.nl.b_lms.sch.task.service.IschBaseTaskService;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.wms.sch.tasks.InHotTask;
import org.redisson.api.RLock;
import org.redisson.api.RedissonClient;
@@ -50,7 +51,8 @@ public class AutoIntoHotCacheTask {
log.info("烘箱对接位：{} 没找到暂存位！", task.getPoint_code1());
return;
}
new InHotTask().immediateNotifyAcs(task.getTask_id());
InHotTask inHotTask = SpringContextHolder.getBean(InHotTask.class);
inHotTask.immediateNotifyAcs(task.getTask_id());
task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
task.setPoint_code2(cache_jo.getString("point_code"));

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

@@ -122,7 +122,7 @@ public class CallEmpReelTask extends AbstractAcsTask {
if (ObjectUtil.isNotEmpty(schBaseTask.getMaterial_code())) {
rawfoilWorkOrder = rawfoilWorkOrderMapper.selectOne(new LambdaQueryWrapper<RawfoilWorkOrder>()
.eq(RawfoilWorkOrder::getContainer_name, schBaseTask.getMaterial_code())
.ne(RawfoilWorkOrder::getStatus, "40")
.ne(RawfoilWorkOrder::getStatus, "09")
.eq(RawfoilWorkOrder::getIs_delete, "0"));
}
String car_no = taskObj.getString("car_no");
@@ -146,7 +146,7 @@ public class CallEmpReelTask extends AbstractAcsTask {
// 更新生箔工单状态为初始化、清除称重信息
if (rawfoilWorkOrder != null) {
rawfoilWorkOrder.setStatus("00");
rawfoilWorkOrder.setStatus("01");
rawfoilWorkOrder.setProductin_qty(new BigDecimal(0));
rawfoilWorkOrder.setUpdate_time(DateUtil.now());
rawfoilWorkOrderMapper.updateById(rawfoilWorkOrder);
@@ -161,48 +161,35 @@ public class CallEmpReelTask extends AbstractAcsTask {
}
if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
// 更改任务状态为完成
schBaseTask.setTask_status(TaskStatusEnum.FINISHED.getCode());
schBaseTask.setUpdate_optid(currentUserId);
schBaseTask.setUpdate_optname(currentUsername);
schBaseTask.setUpdate_time(DateUtil.now());
schBaseTaskMapper.updateById(schBaseTask);
String point_code1 = schBaseTask.getPoint_code1();
String point_code2 = schBaseTask.getPoint_code2();
String point_code3 = schBaseTask.getPoint_code3();
String point_code4 = schBaseTask.getPoint_code4();
// 取空取满放空放满
if ("010101".equals(schBaseTask.getTask_type())) {
if (rawfoilWorkOrder == null) {
throw new BadRequestException("工单不存在");
}
//更新生箔机点位库存
updateSbIvt(point_code3, "01", "02");
//更新冷却区点位库存
updateIvtIvt(point_code4, "02", "01", rawfoilWorkOrder);
CoolPointIvt coolPointIvt = coolPointIvtMapper.selectOne(new LambdaQueryWrapper<CoolPointIvt>().eq(CoolPointIvt::getEmpty_point_code, point_code1));
if (coolPointIvt == null) {
throw new BadRequestException("未找到可用点位:" + point_code1);
}
//取满放满
if ("010102".equals(schBaseTask.getTask_type())) {
if (rawfoilWorkOrder == null) {
throw new BadRequestException("工单不存在");
//更新冷却区空轴位库存状态
coolPointIvt.setEmpty_point_status("01");
coolPointIvt.setEmpty_vehicle_code("");
coolPointIvtMapper.updateById(coolPointIvt);
CoolPointIvt coolPointIvt2 = coolPointIvtMapper.selectOne(new LambdaQueryWrapper<CoolPointIvt>().eq(CoolPointIvt::getFull_point_code, point_code4));
if (coolPointIvt2 == null) {
throw new BadRequestException("未找到可用点位:" + point_code4);
}
//更新生箔机点位库存
updateSbIvt(point_code1, "01", null);
//更新冷却区点位库存
updateIvtIvt(point_code2, "02", null, rawfoilWorkOrder);
}
//起点是冷却区 取空放空
if ("010103".equals(schBaseTask.getTask_type())) {
//更新生箔机点位库存
updateSbIvt(point_code2, null, "02");
//更新冷却区点位库存
updateIvtIvt(point_code1, null, "01", rawfoilWorkOrder);
}
//起点是生箔机 取空放空
if ("010104".equals(schBaseTask.getTask_type())) {
//更新生箔机点位库存
updateSbIvt(point_code1, null, "01");
//更新冷却区点位库存
updateIvtIvt(point_code2, null, "02", rawfoilWorkOrder);
}
if ("010101".equals(schBaseTask.getTask_type()) || "010102".equals(schBaseTask.getTask_type())) {
//更新母卷工单状态
HashMap<String, String> map = new HashMap<>();
rawfoilWorkOrder.setStatus("40");
rawfoilWorkOrder.setStatus("09");
rawfoilWorkOrder.setOrigin("1");
rawfoilWorkOrder.setRoll_status("0");
rawfoilWorkOrder.setRealend_time(DateUtil.now());
@@ -211,59 +198,18 @@ public class CallEmpReelTask extends AbstractAcsTask {
rawfoilWorkOrder.setFinish_type("01");
rawfoilWorkOrder.setUpdate_time(DateUtil.now());
rawfoilWorkOrderMapper.updateById(rawfoilWorkOrder);
}
// 更改任务状态为完成
schBaseTask.setTask_status(TaskStatusEnum.FINISHED.getCode());
schBaseTask.setUpdate_optid(currentUserId);
schBaseTask.setUpdate_optname(currentUsername);
schBaseTask.setUpdate_time(DateUtil.now());
schBaseTaskMapper.updateById(schBaseTask);
}
}
private void updateSbIvt(String fullPointCode,
String fullStatus, String emptyStatus) {
SbPointIvt sbPointIvt;
// 更新冷却位满轴位库存状态
coolPointIvt2.setFull_point_status("02");
coolPointIvt2.setInstorage_time(DateUtil.now());
coolPointIvt2.setContainer_name(rawfoilWorkOrder.getContainer_name());
coolPointIvt2.setWorkorder_id(String.valueOf(rawfoilWorkOrder.getWorkorder_id()));
coolPointIvt2.setIvt_qty(rawfoilWorkOrder.getProductin_qty());
coolPointIvt2.setCool_ivt_status("01");
coolPointIvt2.setEmpty_vehicle_code("");
coolPointIvtMapper.updateById(coolPointIvt2);
if (fullPointCode.endsWith("M")) {
sbPointIvt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper<SbPointIvt>()
.eq(SbPointIvt::getFull_point_code, fullPointCode));
} else {
sbPointIvt = sbPointIvtMapper.selectOne(new LambdaQueryWrapper<SbPointIvt>()
.eq(SbPointIvt::getEmpty_point_code, fullPointCode));
}
if (sbPointIvt == null) {
throw new BadRequestException("未找到对应的点位: " + fullPointCode);
}
if (fullStatus != null) sbPointIvt.setFull_point_status(fullStatus);
if (emptyStatus != null) sbPointIvt.setEmpty_point_status(emptyStatus);
sbPointIvtMapper.updateById(sbPointIvt);
}
private void updateIvtIvt(String fullPointCode,
String fullStatus,
String emptyStatus,
RawfoilWorkOrder rawfoilWorkOrder) {
CoolPointIvt coolPointIvt;
if (fullPointCode.endsWith("M")) {
coolPointIvt = coolPointIvtMapper.selectOne(new LambdaQueryWrapper<CoolPointIvt>()
.eq(CoolPointIvt::getFull_point_code, fullPointCode));
} else {
coolPointIvt = coolPointIvtMapper.selectOne(new LambdaQueryWrapper<CoolPointIvt>()
.eq(CoolPointIvt::getEmpty_point_code, fullPointCode));
}
if (coolPointIvt == null) {
throw new BadRequestException("未找到对应的点位: " + fullPointCode);
}
coolPointIvt.setFull_point_status(fullStatus);
coolPointIvt.setEmpty_point_status(emptyStatus);
if (rawfoilWorkOrder != null) {
coolPointIvt.setInstorage_time(DateUtil.now());
coolPointIvt.setContainer_name(rawfoilWorkOrder.getContainer_name());
coolPointIvt.setWorkorder_id(String.valueOf(rawfoilWorkOrder.getWorkorder_id()));
}
coolPointIvtMapper.updateById(coolPointIvt);
}
@Override
@@ -279,11 +225,10 @@ public class CallEmpReelTask extends AbstractAcsTask {
@Override
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task");
String currentUserId = SecurityUtils.getCurrentUserId();
String currentUsername = SecurityUtils.getCurrentUsername();
CutConveyorTask cutConveyorTask = new CutConveyorTask();
CutConveyorTask cutConveyorTask = SpringContextHolder.getBean(CutConveyorTask.class);
String point_code1 = form.getString("point_code1");
String point_code2 = form.getString("point_code2");

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

@@ -24,6 +24,7 @@ import org.nl.common.utils.SecurityUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.modules.wql.WQL;
import org.nl.modules.wql.core.bean.WQLObject;
import org.nl.modules.wql.util.SpringContextHolder;
import org.nl.system.service.dict.dao.Dict;
import org.nl.system.service.dict.dao.mapper.SysDictMapper;
import org.nl.wms.ext.mes.service.impl.LmsToMesServiceImpl;
@@ -70,6 +71,10 @@ public class CoolCutTask extends AbstractAcsTask {
private RawfoilWorkOrderMapper rawfoilWorkOrderMapper;
@Autowired
private CutConveyorTask cutConveyorTask;
@Override
public List<AcsTaskDto> addTask() {
/*
@@ -206,7 +211,7 @@ public class CoolCutTask extends AbstractAcsTask {
}
//单送满卷
if ("010302".equals(schBaseTask.getTask_status())) {
if ("010302".equals(schBaseTask.getTask_type())) {
// 更新主表状态
StIvtCoolregionio coolMst = stIvtCoolregionioMapper.selectOne(new LambdaQueryWrapper<StIvtCoolregionio>().eq(StIvtCoolregionio::getTask_id, task_id));
// JSONObject coolMst = ivtTab.query("task_id = '" + task_id + "'").uniqueResult(0);
@@ -233,7 +238,7 @@ public class CoolCutTask extends AbstractAcsTask {
StIvtCutpointivt cut_jo = stIvtCutpointivtMapper.selectOne(new LambdaQueryWrapper<StIvtCutpointivt>().eq(StIvtCutpointivt::getFull_point_code, point_code2));
cut_jo.setFull_point_status("02");
cut_jo.setContainer_name(container_name);
cut_jo.setUpdate_optid(Long.getLong(currentUserId));
cut_jo.setUpdate_optid(Long.parseLong(currentUserId));
cut_jo.setUpdate_optname(currentUsername);
cut_jo.setUpdate_time(DateUtil.now());
stIvtCutpointivtMapper.updateById(cut_jo);
@@ -333,7 +338,7 @@ public class CoolCutTask extends AbstractAcsTask {
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task");
CutConveyorTask cutConveyorTask = new CutConveyorTask();
CutConveyorTask cutConveyorTask = SpringContextHolder.getBean(CutConveyorTask.class);
String currentUserId = SecurityUtils.getCurrentUserId();
String currentUsername = SecurityUtils.getCurrentUsername();

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

@@ -232,7 +232,7 @@ public class InCoolIvtTask extends AbstractAcsTask {
@Override
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
CutConveyorTask cutConveyorTask = new CutConveyorTask();
CutConveyorTask cutConveyorTask = SpringContextHolder.getBean(CutConveyorTask.class);
String currentUserId = SecurityUtils.getCurrentUserId();
String currentUsername = SecurityUtils.getCurrentUsername();

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

@@ -194,19 +194,6 @@ public class InHotTask extends AbstractAcsTask {
String container_name = jsonCoolIvt.getContainer_name(); // 母卷号
String workorder_id = jsonCoolIvt.getWorkorder_id(); // 母卷工单标识
jsonCoolIvt.setFull_point_status("01");
jsonCoolIvt.setCool_ivt_status("01");
jsonCoolIvt.setContainer_name("");
jsonCoolIvt.setWorkorder_id("");
jsonCoolIvt.setIvt_qty(BigDecimal.valueOf(0));
jsonCoolIvt.setInstorage_time("");
jsonCoolIvt.setUpdate_optid(currentUserId);
jsonCoolIvt.setUpdate_optname(currentUsername);
jsonCoolIvt.setUpdate_time(DateUtil.now());
coolPointIvtMapper.updateById(jsonCoolIvt);
// 更新烘箱区库存状态
HotPointIvt jsonHotIvt = hotPointIvtMapper.selectOne(new LambdaQueryWrapper<HotPointIvt>().eq(HotPointIvt::getPoint_code, schBaseTask.getPoint_code3()));
jsonHotIvt.setPoint_status("02");
@@ -219,6 +206,17 @@ public class InHotTask extends AbstractAcsTask {
jsonHotIvt.setUpdate_time(DateUtil.now());
hotPointIvtMapper.updateById(jsonHotIvt);
jsonCoolIvt.setFull_point_status("01");
jsonCoolIvt.setCool_ivt_status("01");
jsonCoolIvt.setContainer_name("");
jsonCoolIvt.setWorkorder_id("");
jsonCoolIvt.setIvt_qty(BigDecimal.valueOf(0));
jsonCoolIvt.setInstorage_time("");
jsonCoolIvt.setUpdate_optid(currentUserId);
jsonCoolIvt.setUpdate_optname(currentUsername);
jsonCoolIvt.setUpdate_time(DateUtil.now());
coolPointIvtMapper.updateById(jsonCoolIvt);
hot_point_code = jsonHotIvt.getExt_code();
}
@@ -266,7 +264,7 @@ public class InHotTask extends AbstractAcsTask {
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
CutConveyorTask cutConveyorTask = new CutConveyorTask();
CutConveyorTask cutConveyorTask = SpringContextHolder.getBean(CutConveyorTask.class);
String currentUserId = SecurityUtils.getCurrentUserId();
String currentUsername = SecurityUtils.getCurrentUsername();
@@ -293,17 +291,20 @@ public class InHotTask extends AbstractAcsTask {
task.setTask_id(IdUtil.getSnowflake(1, 1).nextId() + "");
task.setTask_code(IdUtil.getSnowflake(1, 1).nextId() + "");
task.setTask_type("010201");
if (StrUtil.isNotEmpty(point_code2) && StrUtil.isNotEmpty(point_code3)) {
// if (StrUtil.isNotEmpty(point_code2) && StrUtil.isNotEmpty(point_code3)) {
// task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
// task.setPoint_code2(form.getString("point_code2"));
// task.setPoint_code3(form.getString("point_code3"));
// } else {
// task.setTask_status(TaskStatusEnum.SURE_START.getCode());
// task.setPoint_code2("");
// task.setPoint_code3("");
// task.setRemark(form.toJSONString());
// }
task.setTask_status(TaskStatusEnum.START_AND_POINT.getCode());
task.setPoint_code1(form.getString("point_code1"));
task.setPoint_code2(form.getString("point_code2"));
task.setPoint_code3(form.getString("point_code3"));
} else {
task.setTask_status(TaskStatusEnum.SURE_START.getCode());
task.setPoint_code2("");
task.setPoint_code3("");
task.setRemark(form.toJSONString());
}
task.setPoint_code1(form.getString("point_code1"));
task.setProduct_area(form.getString("product_area"));
task.setRequest_param(form.getString("request_param"));
task.setSort_seq(BigDecimal.valueOf(1));
@@ -319,12 +320,16 @@ public class InHotTask extends AbstractAcsTask {
} else {
task.setPriority(priority_jo.getValue());
}
if (StrUtil.isNotEmpty(form.getString("point_code3"))) {
task.setAcs_task_type("8");
}else {
task.setAcs_task_type("6");
}
schBaseTaskMapper.insert(task);
task_id = task.getTask_id();
if ("04".equals(task.getTask_status())) {
immediateNotifyAcs(task_id);
}
// if ("04".equals(task.getTask_status())) {
// immediateNotifyAcs(task_id);
// }
//更新对应点位库存为已裹膜
CoolPointIvt cool_ivt = coolPointIvtMapper.selectOne(new LambdaQueryWrapper<CoolPointIvt>().eq(CoolPointIvt::getFull_point_code, form.getString("point_code1")));
if (ObjectUtil.isEmpty(cool_ivt)) {
@@ -370,8 +375,8 @@ public class InHotTask extends AbstractAcsTask {
task.setAcs_task_type("6");
schBaseTaskMapper.insert(task);
task_id = task.getTask_id();
immediateNotifyAcs(task_id);
}
immediateNotifyAcs(task_id);
return task_id;
}

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

@@ -192,7 +192,7 @@ public class OutHotTask extends AbstractAcsTask {
@Transactional(rollbackFor = Exception.class)
public String createTask(JSONObject form) {
WQLObject tab = WQLObject.getWQLObject("SCH_BASE_Task");
CutConveyorTask cutConveyorTask = new CutConveyorTask();
CutConveyorTask cutConveyorTask = SpringContextHolder.getBean(CutConveyorTask.class);
String currentUserId = SecurityUtils.getCurrentUserId();
String currentUsername = SecurityUtils.getCurrentUsername();

7
lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
View File

@@ -313,7 +313,7 @@ public class InBillQueryServiceImpl implements InBillQueryService {
if (StrUtil.isNotEmpty(box_name)) {
String[] s = box_name.split("木箱");
String s1 = s[1];
String[] split = s1.split("\\|");
String[] split = s1.split("\\\\");
mp.put("木箱规格/尺寸", split[1] + "*" + split[2]);
} else {
mp.put("木箱规格/尺寸", "");
@@ -493,7 +493,7 @@ public class InBillQueryServiceImpl implements InBillQueryService {
if (StrUtil.isNotEmpty(box_name)) {
String[] s = box_name.split("木箱");
String s1 = s[1];
String[] split = s1.split("\\|");
String[] split = s1.split("\\\\");
mp.put("木箱规格/尺寸", split[1] + "*" + split[2]);
} else {
mp.put("木箱规格/尺寸", "");
@@ -591,7 +591,7 @@ public class InBillQueryServiceImpl implements InBillQueryService {
if (StrUtil.isNotEmpty(box_name)) {
String[] s = box_name.split("木箱");
String s1 = s[1];
String[] split = s1.split("\\|");
String[] split = s1.split("\\\\");
mp.put("木箱规格/尺寸", split[1] + "*" + split[2]);
} else {
mp.put("木箱规格/尺寸", "");
@@ -693,5 +693,4 @@ public class InBillQueryServiceImpl implements InBillQueryService {
FileUtil.downloadExcel(list, response);
}
}

3
lms/nladmin-ui/src/views/wms/basedata/master/material/index.vue
View File

@@ -93,8 +93,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
</el-col>
<el-col :span="8" />
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">

32
lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue
View File

@@ -11,16 +11,16 @@
<span slot="title" class="dialog-footer">
<div class="crud-opts2">
<span class="el-dialog__title2">{{$t('common.outboundAllocation')}}</span>
<span class="el-dialog__title2">{{ $t('common.outboundAllocation') }}</span>
<span class="crud-opts-right2">
<!--左侧插槽-->
<slot name="left" />
<el-button slot="left" type="info" @click="dialogVisible = false">{{$t('common.close')}}</el-button>
<el-button slot="left" type="info" @click="dialogVisible = false">{{ $t('common.close') }}</el-button>
</span>
</div>
</span>
<div class="crud-opts2">
<span class="role-span">{{$t('common.outboundDetails')}}</span>
<span class="role-span">{{ $t('common.outboundDetails') }}</span>
<div class="crud-opts-form">
<el-form ref="form" :inline="true" :model="form" size="mini">
<el-form-item :label="$t('common.warehouseArea')" prop="gender2">
@@ -46,7 +46,7 @@
size="mini"
@click="allDiv()"
>
{{$t('common.allocateAll')}}
{{ $t('common.allocateAll') }}
</el-button>
<el-button
slot="left"
@@ -57,7 +57,7 @@
size="mini"
@click="allCancel()"
>
{{$t('common.cancelAll')}}
{{ $t('common.cancelAll') }}
</el-button>
<el-button
v-if="this.mstrow.bill_type !== '1011'"
@@ -70,7 +70,7 @@
:disabled="button1"
@click="oneDiv()"
>
{{$t('common.autoAllocate')}}
{{ $t('common.autoAllocate') }}
</el-button>
<el-button
v-if="this.mstrow.bill_type !== '1011'"
@@ -83,7 +83,7 @@
:disabled="button2"
@click="oneCancel()"
>
{{$t('common.autoCancel')}}
{{ $t('common.autoCancel') }}
</el-button>
<el-button
slot="left"
@@ -95,7 +95,7 @@
:disabled="button3"
@click="openStructIvt"
>
{{$t('common.manualAllocate')}}
{{ $t('common.manualAllocate') }}
</el-button>
<el-button
v-if="this.mstrow.bill_type !== '1011'"
@@ -107,7 +107,7 @@
size="mini"
@click="allSetPointAllDtl"
>
{{$t('common.oneClickSetting')}}
{{ $t('common.oneClickSetting') }}
</el-button>
</span>
</div>
@@ -140,7 +140,7 @@
</el-table>
</el-card>
<div class="crud-opts2">
<span class="role-span">{{$t('common.allocationDetails')}}</span>
<span class="role-span">{{ $t('common.allocationDetails') }}</span>
<div class="crud-opts-form">
<el-form ref="form2" :inline="true" :model="form2" size="mini">
<el-form-item :label="$t('common.toBeAllocated')" prop="unassign_qty" />
@@ -180,11 +180,11 @@
</el-select>
</el-form-item>
<el-form-item prop="checked">
<el-checkbox v-if="mstrow.stor_id !== '1582991156504039455'" v-model="checked">{{$t('common.isAbnormalOutbound')}}</el-checkbox>
<el-checkbox v-if="mstrow.stor_id !== '1582991156504039455'" v-model="checked">{{ $t('common.isAbnormalOutbound') }}</el-checkbox>
</el-form-item>
<el-form-item :label="$t('common.overdueShipment') + ':'" prop="is_overdue">
<el-radio v-model="rowmst.is_overdue" label="1" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">{{$t('common.doNotShipOverdue')}}</el-radio>
<el-radio v-model="rowmst.is_overdue" label="0" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">{{$t('common.shipOverdue')}}</el-radio>
<el-radio v-model="rowmst.is_overdue" label="1" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">{{ $t('common.doNotShipOverdue') }}</el-radio>
<el-radio v-model="rowmst.is_overdue" label="0" :disabled="rowmst.bill_status === '40'" @change="updataIsOverdue">{{ $t('common.shipOverdue') }}</el-radio>
</el-form-item>
<!--<el-form-item label="超期数量:" prop="assign_qty" v-if="rowmst.is_overdue === '1'">
<el-input-number
@@ -223,7 +223,7 @@
:disabled="button4"
@click="oneSetPoint2"
>
{{$t('common.setSite')}}
{{ $t('common.setSite') }}
</el-button>
<el-button
v-if="this.mstrow.bill_type !== '1011'"
@@ -236,7 +236,7 @@
size="mini"
@click="allSetPoint"
>
{{$t('common.oneClickSetting')}}
{{ $t('common.oneClickSetting') }}
</el-button>
<el-button
v-if="this.mstrow.bill_type === '1011'"
@@ -249,7 +249,7 @@
size="mini"
@click="saveUpdate"
>
{{$t('common.saveChanges')}}
{{ $t('common.saveChanges') }}
</el-button>
</span>
</div>