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

Merge branch 'refs/heads/b_lms' into master_merge

Browse Source
This commit is contained in:
zhouz
2024-06-12 13:38:18 +08:00
parent ad2879667b 6c5bc123c9
commit cb4117cf73
9 changed files with 126 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/IBstIvtShafttubeivtService.java
View File

@@ -45,10 +45,10 @@ public interface IBstIvtShafttubeivtService extends IService<BstIvtShafttubeivt>
/**
* 获取启用的 类型 区域 有无轴的点位 (无任务)
* @param type
* @param location
* @param have
* @return
* @param type 1,2,3,4,5,6
* @param location 0 1
* @param have 0 1
* @return /
*/
List<BstIvtShafttubeivt> getAllShaftPointsByConditions(String type, String location, String have);
@@ -60,6 +60,14 @@ public interface IBstIvtShafttubeivtService extends IService<BstIvtShafttubeivt>
*/
BstIvtShafttubeivt getByPointCode(String point, boolean flag);
/**
* 根据点位类型获取点位
* @param type 类型 1气胀轴库, 2穿拔轴点位, 3套管工位, 4成品称重位, 5废箔称重位, 6B气胀轴暂存
* @param flag 是否需要校验启用
* @return /
*/
List<BstIvtShafttubeivt> getAllByPointType(String type, boolean flag);
/**
* 获得气胀轴库对应的气涨轴位置
* @param qzzSize 气涨轴尺寸

14
lms/nladmin-system/src/main/java/org/nl/b_lms/bst/ivt/shafttubeivt/service/impl/BstIvtShafttubeivtServiceImpl.java
View File

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.nl.b_lms.bst.ivt.shafttubeivt.service.dto.BstIvtShafttubeivtQuery;
import org.nl.b_lms.sch.tasks.slitter.constant.SlitterConstant;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.common.domain.query.PageQuery;
import org.nl.common.utils.SecurityUtils;
@@ -97,10 +98,21 @@ public class BstIvtShafttubeivtServiceImpl extends ServiceImpl<BstIvtShafttubeiv
}
LambdaQueryWrapper<BstIvtShafttubeivt> lam = new QueryWrapper<BstIvtShafttubeivt>().lambda();
lam.eq(BstIvtShafttubeivt::getPoint_code, point)
.eq(flag, BstIvtShafttubeivt::getIs_used, "1");
.eq(flag, BstIvtShafttubeivt::getIs_used, SlitterConstant.SLITTER_YES);
return bstIvtShafttubeivtMapper.selectOne(lam);
}
@Override
public List<BstIvtShafttubeivt> getAllByPointType(String type, boolean flag) {
if (ObjectUtil.isEmpty(type)) {
return null;
}
LambdaQueryWrapper<BstIvtShafttubeivt> lam = new QueryWrapper<BstIvtShafttubeivt>().lambda();
lam.eq(BstIvtShafttubeivt::getPoint_type, type)
.eq(flag, BstIvtShafttubeivt::getIs_used, SlitterConstant.SLITTER_YES);
return bstIvtShafttubeivtMapper.selectList(lam);
}
@Override
public List<BstIvtShafttubeivt> getByQzzSize(String qzzSize, String pointCode, String location) {
return bstIvtShafttubeivtMapper.getByQzzSize(qzzSize, pointCode, location);

13
lms/nladmin-system/src/main/java/org/nl/b_lms/pda/controller/SlitterPdaController.java
View File

@@ -46,4 +46,17 @@ public class SlitterPdaController {
public ResponseEntity<Object> moveVehicle(@RequestBody JSONObject param) {
return new ResponseEntity<>(slitterDevices.moveVehicle(param), HttpStatus.OK);
}
@PostMapping("/getShaftPoint")
@Log("获取套拔轴下拉框数据")
@SaIgnore
public ResponseEntity<Object> getShaftPoint() {
return new ResponseEntity<>(slitterDevices.getShaftPoint(), HttpStatus.OK);
}
@PostMapping("/doInitShaftPoint")
@Log("初始化套拔轴点位")
@SaIgnore
public ResponseEntity<Object> doInitShaftPoint(@RequestBody JSONObject param) {
return new ResponseEntity<>(slitterDevices.doInitShaftPoint(param), HttpStatus.OK);
}
}

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

@@ -14,6 +14,10 @@ import java.util.List;
*/
public interface SchBaseTaskMapper extends BaseMapper<SchBaseTask> {
List<SchBaseTask> checkHaveTask(BstIvtCutpointivt p);
/**
* 检测点位编码是否存在任务
* @param code 点位编码
* @return 任务
*/
List<SchBaseTask> checkHaveTask(String code);
}

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

@@ -7,12 +7,10 @@
SELECT *
FROM sch_base_task
WHERE task_code <![CDATA[ < ]]> '07'
AND ( point_code1 = #{point_code}
OR point_code2 = #{point_code}
OR point_code1 = #{truss_point_code1}
OR point_code2 = #{truss_point_code1}
OR point_code1 = #{truss_point_code2}
OR point_code2 = #{truss_point_code2}
AND ( point_code1 = #{code}
OR point_code2 = #{code}
OR point_code3 = #{code}
OR point_code4 = #{code}
)
</select>
</mapper>

8
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/IschBaseTaskService.java
View File

@@ -61,11 +61,11 @@ public interface IschBaseTaskService extends IService<SchBaseTask> {
List<SchBaseTask> getIssueTasks(String thisClass);
/**
* 检测点位是否存在任务
* @param p
* @return
* 检测点位编码是否存在任务
* @param code 点位编码
* @return 任务
*/
List<SchBaseTask> checkHaveTask(BstIvtCutpointivt p);
List<SchBaseTask> checkHaveTask(String code);
}

4
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/task/service/impl/SchBaseTaskServiceImpl.java
View File

@@ -104,8 +104,8 @@ public class SchBaseTaskServiceImpl extends ServiceImpl<SchBaseTaskMapper, SchBa
}
@Override
public List<SchBaseTask> checkHaveTask(BstIvtCutpointivt p) {
return schBaseTaskMapper.checkHaveTask(p);
public List<SchBaseTask> checkHaveTask(String code) {
return schBaseTaskMapper.checkHaveTask(code);
}

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

@@ -105,4 +105,17 @@ public interface SlitterService {
* @return /
*/
JSONObject acsToReduceTube(JSONObject param);
/**
* 获取气胀轴点位下拉框
* @return /
*/
JSONArray getShaftPoint();
/**
* 初始化套拔轴点位
* @param param /
* @return /
*/
JSONObject doInitShaftPoint(JSONObject param);
}

61
lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java
View File

@@ -36,6 +36,7 @@ import org.nl.b_lms.sch.tasks.slitter.constant.SlitterEnum;
import org.nl.b_lms.sch.tasks.slitter.mapper.SlitterMapper;
import org.nl.b_lms.sch.tasks.slitter.service.SlitterService;
import org.nl.b_lms.sch.tasks.slitter.util.SlitterTaskUtil;
import org.nl.common.utils.SecurityUtils;
import org.nl.common.utils.TaskUtils;
import org.nl.modules.common.exception.BadRequestException;
import org.nl.wms.ext.acs.service.WmsToAcsService;
@@ -268,10 +269,11 @@ public class SlitterServiceImpl implements SlitterService {
String qzzNo = resourceName.substring(0, 2)
+ resourceName.substring(resourceName.length() - 2)
+ demoPlan.getSplit_group()
+ TaskUtils.getDateTime("MMddHHmm") + "-";
+ TaskUtils.getDateTime("MMddHHmm") + "-"
+ demoPlan.getUp_or_down();
plans.forEach(plan -> {
plan.setIs_child_tz_ok(SlitterConstant.SLITTER_YES);
plan.setQzzno(qzzNo + plan.getUp_or_down());
plan.setQzzno(qzzNo);
TaskUtils.updateOptMessageBySlitterPlan(plan);
});
slittingproductionplanService.updateBatchById(plans);
@@ -732,4 +734,59 @@ public class SlitterServiceImpl implements SlitterService {
res.put("message", "请求成功!");
return res;
}
@Override
public JSONArray getShaftPoint() {
List<BstIvtShafttubeivt> allByPoint = shafttubeivtService.getAllByPointType("2", false);
JSONArray jsonArray = allByPoint.stream()
.map(item -> {
JSONObject jsonObject = new JSONObject();
jsonObject.put("text", item.getPoint_name());
jsonObject.put("value", item.getPoint_code());
return jsonObject;
})
.collect(Collectors.toCollection(JSONArray::new));
return jsonArray;
}
@Override
public JSONObject doInitShaftPoint(JSONObject param) {
log.info("手持穿拔轴初始化参数：{}", param);
String pointCode = param.getString("point_code");
// 手持按钮：穿拔轴初始化
//1、判断当前点位不能存在其他任务
List<SchBaseTask> taskList = taskService.checkHaveTask(pointCode);
if (taskList.size() > 0) {
throw new BadRequestException("操作失败，点位存在未完成的任务!");
}
//2、把当前点位上子卷号对应的is_paper_ok改为1
BstIvtShafttubeivt shaftPoint = shafttubeivtService.getByPointCode(pointCode, false);
if (SlitterConstant.SLITTER_NO.equals(shaftPoint.getHave_qzz())) {
throw new BadRequestException("点位不存在气胀轴信息，无需初始化!");
}
List<String> containers = Stream.of(shaftPoint.getContainer_name1(), shaftPoint.getContainer_name2())
.filter(ObjectUtil::isNotEmpty).collect(Collectors.toList());
LambdaUpdateWrapper<PdmBiSlittingproductionplan> upPlanLam = new LambdaUpdateWrapper<>();
upPlanLam.set(PdmBiSlittingproductionplan::getIs_paper_ok, "1")
.eq(PdmBiSlittingproductionplan::getUpdate_optid, SecurityUtils.getCurrentUserId())
.eq(PdmBiSlittingproductionplan::getUpdate_optname, SecurityUtils.getCurrentUsername())
.eq(PdmBiSlittingproductionplan::getUpdate_time, DateUtil.now())
.in(PdmBiSlittingproductionplan::getContainer_name, containers);
slittingproductionplanService.update(upPlanLam);
//3、清空当前穿拔轴点位的库存信息
shaftPoint.setHave_qzz(SlitterConstant.SLITTER_NO);
shaftPoint.setTube_code1("");
shaftPoint.setTube_code2("");
shaftPoint.setTube_name1("");
shaftPoint.setTube_name2("");
shaftPoint.setContainer_name1("");
shaftPoint.setContainer_name2("");
shaftPoint.setQzz_size("");
TaskUtils.updateOptMessageByBShaftPoint(shaftPoint);
shafttubeivtService.update(shaftPoint);
JSONObject res = new JSONObject();
res.put("status", HttpStatus.HTTP_OK);
res.put("message", "请求成功!");
return res;
}
}