xiaoning
/
gj_erp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.同步小池设备加工信息,优化信息显示样式

Browse Source 
2.优化看板pdf显示,增加下拉滚动条
master
董哲奇 5 months ago
parent e7a207c0a6
commit 40e9732910
10 changed files with 73 additions and 37 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/dsic/gj_erp/bean/xiaochi/CutPlan.java
Unescape View File

@ -20,7 +20,7 @@ public class CutPlan extends Model<CutPlan> {
private String nestName;
private String nestNameSub1;//套料图号
private String nestNameSub1;//套料图号 _V:切割;_K:划线
private String nestItaatu;//厚

8
src/main/java/com/dsic/gj_erp/controller/kban/KbanController.java
Unescape View File

@ -59,6 +59,14 @@ public class KbanController {
@Value("${pdfUri}")
private String pdfUri;
/**
* 设备状态及加工情况
*/
@GetMapping("/getDeviceStatus")
public ResultBean<?> getDeviceStatus() {
return new ResultBean<>(kbanService.getDeviceStatus());
}
/**
* 中日程表格数据
*/

2
src/main/java/com/dsic/gj_erp/mapper/xiaochi/CutPlanMapper.java
Unescape View File

@ -9,4 +9,6 @@ public interface CutPlanMapper extends BaseMapper<CutPlan> {
List<CutPlan> getCutPlanList(String st,String ed);
void synBom_qgPgd();
}

4
src/main/java/com/dsic/gj_erp/mapper/xiaochi/DeviceMapper.java
Unescape View File

@ -3,5 +3,9 @@ package com.dsic.gj_erp.mapper.xiaochi;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.dsic.gj_erp.bean.xiaochi.Device;
import java.util.List;
public interface DeviceMapper extends BaseMapper<Device> {
List<Device> getDeviceStatus();
}

2
src/main/java/com/dsic/gj_erp/service/ApiService.java
Unescape View File

@ -70,7 +70,7 @@ public class ApiService {
if (syuserp.getIpAddress()==null ) {
throw new CustomException(10201, "登陆失败，IP地址未配置！");
}
if (!syuserp.getIpAddress().equals(ip) ) {
if (!syuserp.getIpAddress().contains("all")&&!syuserp.getIpAddress().equals(ip) ) {
throw new CustomException(10201, "登陆失败，IP地址未授权！");
}
// if (StrUtil.isNotEmpty(syuserp.getMacAddress())&& !syuserp.getMacAddress().equals(macAddress)) {

7
src/main/java/com/dsic/gj_erp/service/KbanService.java
Unescape View File

@ -7,6 +7,8 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import com.dsic.gj_erp.bean.xiaochi.Device;
import com.dsic.gj_erp.mapper.xiaochi.DeviceMapper;
import org.springframework.stereotype.Service;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
@ -21,6 +23,11 @@ import lombok.AllArgsConstructor;
public class KbanService {
private final KbanMapper kbanMapper;
private final DeviceMapper deviceMapper;
public List<Device> getDeviceStatus(){
return deviceMapper.getDeviceStatus();
}
public Map<String, Object> zrcTable() {
DateTime date = DateUtil.date();

1
src/main/java/com/dsic/gj_erp/service/jhgk/impl/DmSygdMxServiceImpl.java
Unescape View File

@ -1064,6 +1064,7 @@ public class DmSygdMxServiceImpl extends ServiceImpl<DmSygdMxMapper, DmSygdMx> i
//型材抛丸日期
val.stream().filter(item -> "16".equals(item.getKw()))
.filter(item->StrUtil.isNotEmpty(item.getSlrq()))
.min(Comparator.comparing(DmSygdMx::getSlrq)).ifPresent(item -> dmYdjhxf.setXcpw(item.getSlrq()));
//抛丸日期

59
src/main/java/com/dsic/gj_erp/service/xiaochi/XiaoChiService.java
Unescape View File

@ -6,12 +6,15 @@ import cn.hutool.core.util.StrUtil;
import cn.hutool.cron.CronUtil;
import cn.hutool.cron.task.Task;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.dsic.gj_erp.bean.jhgk.DmYdjh;
import com.dsic.gj_erp.bean.pgd.PgdQgjh;
import com.dsic.gj_erp.bean.xiaochi.CutPlan;
import com.dsic.gj_erp.bean.xiaochi.Device;
import com.dsic.gj_erp.bean.xiaochi.XiaochiUser;
import com.dsic.gj_erp.mapper.xiaochi.CutPlanMapper;
import com.dsic.gj_erp.mapper.xiaochi.DeviceMapper;
import com.dsic.gj_erp.service.pgd.PgdQgjhService;
import com.dsic.gj_erp.service.zyjh.ZyjhService;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -24,9 +27,10 @@ import java.util.stream.Collectors;
@AllArgsConstructor
public class XiaoChiService{
private final PgdQgjhService qgjhService;
private final ZyjhService zyjhService;
private final CutPlanMapper mapper;
/**
* 小池同步,先使用手动拉取方式,让钢加人员进行检查
* 后续改为自动拉取
@ -40,50 +44,47 @@ public class XiaoChiService{
userMap.put(item.getEmployeeNumber(),item);
});
Map<Integer,Device> deviceMap=new HashMap<>();
devices.forEach(item->{
deviceMap.put(item.getId(),item);
});
devices.forEach(item-> deviceMap.put(item.getId(),item));
this.exe(userMap,deviceMap);
}
private void exe(Map<String, XiaochiUser> userMap,Map<Integer,Device> deviceMap){
log.info("========小池同步开始===========");
//todo sql查询时过滤划线数据
List<CutPlan> cutPlans = mapper.getCutPlanList(DateUtil.lastMonth().toString(),DateUtil.today())
.stream().filter(item->StrUtil.isNotEmpty(item.getNestKakuyakuDate())).collect(Collectors.toList());
List<PgdQgjh> list=new ArrayList<>();
List<DmYdjh> list=new ArrayList<>();
cutPlans.forEach(item->{
PgdQgjh one = qgjhService.getOne(Wrappers.<PgdQgjh>lambdaQuery()
.eq(PgdQgjh::getCzbh, item.getNestExtC02())
.eq(PgdQgjh::getTlth, item.getNestNameSub1())
.eq(PgdQgjh::getKw, item.getNestExtC03())
.eq(PgdQgjh::getPl, item.getNestExtC04())
DmYdjh one = zyjhService.getOne(Wrappers.<DmYdjh>lambdaQuery()
.eq(DmYdjh::getDcCh, item.getNestExtC02())
.eq(DmYdjh::getTzbh, item.getNestNameSub1())
.eq(DmYdjh::getKw, item.getNestExtC03())
.eq(DmYdjh::getDcPl, item.getNestExtC04())
);
if (ObjectUtil.isNotEmpty(one)){
PgdQgjh _item=new PgdQgjh();
_item.setId(one.getId());
Optional.of(userMap.get(item.getNestExtC05()))
.ifPresent(user-> _item.setFkry(userMap.get(item.getNestExtC05()).getName()));
Optional.of(deviceMap.get(item.getNestCutHo()))
.ifPresent(user-> _item.setQgsbbh(deviceMap.get(item.getNestCutHo()).getMachineName()));
_item.setFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
_item.setQgksrq(item.getQgkssj());
if (StrUtil.isNotEmpty(item.getQgjssj())){
_item.setQgjsrq(item.getQgjssj());
_item.setZt("09");
}
list.add(_item);
}
// if (ObjectUtil.isNotEmpty(one)){
// DmYdjh _item=new DmYdjh();
// _item.setId(one.getId());
// Optional.of(userMap.get(item.getNestExtC05()))
// .ifPresent(user-> _item.setFkry(userMap.get(item.getNestExtC05()).getName()));
//
// Optional.of(deviceMap.get(item.getNestCutHo()))
// .ifPresent(user-> _item.setQgsbbh(deviceMap.get(item.getNestCutHo()).getMachineName()));
// _item.setFkrq(DateUtil.format(DateUtil.date(), "yyyy/MM/dd HH:mm:ss"));
// _item.setQgksrq(item.getQgkssj());
// if (StrUtil.isNotEmpty(item.getQgjssj())){
// _item.setQgjsrq(item.getQgjssj());
// _item.setZt("09");
// }
// list.add(_item);
// }
});
qgjhService.updateBatchById(list,500);
// qgjhService.updateBatchById(list,500);
log.info("========小池同步完成===========");
}
private void exeAuto(Map<String, XiaochiUser> userMap,Map<Integer,Device> deviceMap){
//CronUtil默认为分钟,目前未使用CronUtil.setMatchSecond(true)启动秒级任务,以下表示每30分钟执行一次
//每30分钟执行一次,获取小池今日加工并且未更新切割计划派工单的数据去更新派工单
CronUtil.schedule("*/30 * * * * *", (Task) () -> {
CronUtil.schedule("* */30 * * * *", (Task) () -> {
this.exe(userMap,deviceMap);
});
CronUtil.start();

11
src/main/resources/mappers/xiaochi/CutPlanMapper.xml
Unescape View File

@ -14,14 +14,13 @@
WHERE
isnull(a.nest_ext_c02,'') != '' and a.nest_kakuyaku_date between #{st} and #{ed} and nest_cut_lengs>0
and not EXISTS(
select b.czbh as nest_ext_c02,b.kw as nest_ext_c03 ,b.pl as nest_ext_c04
from pgd_qgjh b
select b.dc_ch as nest_ext_c02,b.kw as nest_ext_c03 ,b.dc_pl as nest_ext_c04
from dm_ydjh b
where
b.czbh=left(a.nest_ext_c02,datalength(a.nest_ext_c02)-1)
and b.tlth=a.nest_name_sub1
b.dc_ch=left(a.nest_ext_c02,datalength(a.nest_ext_c02)-1)
and b.tzbh=a.nest_name_sub1
and b.kw=a.nest_ext_c03
and b.pl=a.nest_ext_c04
and (b.qgksrq is null or qgjsrq is null )
and b.dcpl=a.nest_ext_c04
)
</select>

14
src/main/resources/mappers/xiaochi/DeviceMapper.xml
Unescape View File

@ -2,4 +2,18 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.dsic.gj_erp.mapper.xiaochi.DeviceMapper">
<select id="getDeviceStatus" resultType="map">
SELECT * from (
SELECT
a.id,nest_sintyoku zt,a.machine_name name,
nest_kakuyaku_date beginDate,nest_kakuyaku_time beginTime,
nest_tumikomi_date overDate,nest_tumikomi_time overTime,
case when isnull(b.nest_ext_c02,'')!='' then left(b.nest_ext_c02,datalength(b.nest_ext_c02)-1) else b.nest_ext_c02 end dcCh,
nest_ext_c04 dcPl,
case when isnull(b.nest_name_sub1,'')!='' then left(b.nest_name_sub1,datalength(b.nest_name_sub1)-2) else b.nest_name_sub1 end tzbh,
ROW_NUMBER() over(PARTITION by a.id order by a.id ,b.nest_kakuyaku_time desc) rn from iot_m_machine a left join tbl_nest_mast b on a.id=b.nest_cut_ho and nest_kakuyaku_date=CONVERT(DATE, GETDATE())
) a
where a.rn=1
order by a.id
</select>
</mapper>

Write Preview
Loading…
Cancel
Save