CaiXiang/cigs4
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: CaiXiang:05684b5d2afeb29c20ba6134ff2b8c150ec9400c
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs
..
compare: CaiXiang:b80aaee82c9d5b1189e54a35171c11628f44ffcb
Branches Tags
CaiXiang:master
CaiXiang:yanyang
CaiXiang:cicd
CaiXiang:dynamicDs

No commits in common. "05684b5d2afeb29c20ba6134ff2b8c150ec9400c" and "b80aaee82c9d5b1189e54a35171c11628f44ffcb" have entirely different histories.
05684b5d2a ... b80aaee82c

26 changed files with 219 additions and 769 deletions
Show Stats Expand all files Collapse all files

8
ym-admin/src/main/java/com/cnbm/admin/service/impl/LoginServiceImpl.java
View File

@ -56,10 +56,10 @@ public class LoginServiceImpl implements LoginService {
@Override @Override
public Result login(HttpServletRequest request, LoginParam loginParam) { public Result login(HttpServletRequest request, LoginParam loginParam) {
//验证码是否正确 //验证码是否正确
// boolean flag = captchaService.validate(loginParam.getUuid(), loginParam.getCaptcha()); boolean flag = captchaService.validate(loginParam.getUuid(), loginParam.getCaptcha());
// if(!flag){ if(!flag){
// return new Result<>().error(ErrorCode.CAPTCHA_ERROR, "验证码错误"); return new Result<>().error(ErrorCode.CAPTCHA_ERROR, "验证码错误");
// } }
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginParam.getUsername(),loginParam.getPassword()); UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginParam.getUsername(),loginParam.getPassword());
Authentication authenticate = authenticationManager.authenticate(authenticationToken); Authentication authenticate = authenticationManager.authenticate(authenticationToken);
//登录日志 //登录日志

16
ym-gateway/src/main/resources/application-dev.yml
View File

@ -1,15 +1,10 @@
spring: spring:
datasource: datasource:
#MySQL
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
#MySQL-local url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
# url: jdbc:mysql://10.0.1.249:3306/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true username: root
# username: cigs4 password: 1qaz@WSX3edc$RFV
# password: 1qazxsw2
#MySQL-remote
# url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
# username: root
# password: 1qaz@WSX3edc$RFV
# #Oracle # #Oracle
# driver-class-name: oracle.jdbc.OracleDriver # driver-class-name: oracle.jdbc.OracleDriver
# url: jdbc:oracle:thin:@192.168.10.10:1521:xe # url: jdbc:oracle:thin:@192.168.10.10:1521:xe
@ -65,14 +60,13 @@ dynamic:
# url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true # url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
# username: root # username: root
# password: 1qaz@WSX3edc$RFV # password: 1qaz@WSX3edc$RFV
## camline系统 - remote ## camline系统
camline: camline:
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true url: jdbc:mysql://mysql.picaiba.com:30307/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
username: root username: root
password: 1qaz@WSX3edc$RFV password: 1qaz@WSX3edc$RFV
# #
#camline系统 - local
# camline: # camline:
# driver-class-name: com.mysql.cj.jdbc.Driver # driver-class-name: com.mysql.cj.jdbc.Driver
# url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true # url: jdbc:mysql://10.0.1.23:3306/synapse?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true

7
ym-gateway/src/main/resources/application.yml
View File

@ -33,10 +33,9 @@ spring:
enabled: true enabled: true
redis: redis:
database: 6 database: 6
#host: 10.0.1.249 host: 192.168.0.135
host: 192.168.0.102 port: 6380
port: 6379 password: '@WSXcde3' # 密码（默认为空）
password: '' # 密码（默认为空）
timeout: 6000ms # 连接超时时长（毫秒） timeout: 6000ms # 连接超时时长（毫秒）
jedis: jedis:
pool: pool:

8
ym-gateway/src/main/resources/logback.xml
View File

@ -16,7 +16,7 @@
<property name="logging.eqlog" value="/usr/local/logger/EQCommunicationLog" /> <property name="logging.eqlog" value="/usr/local/logger/EQCommunicationLog" />
<property name="logging.packing" value="/usr/local/logger/Packing" /> <property name="logging.packing" value="/usr/local/logger/Packing" />
<property name="logging.pathwork" value="/usr/local/logger/Working" />
<!--0. 日志格式和颜色渲染 --> <!--0. 日志格式和颜色渲染 -->
@ -392,12 +392,6 @@
<!-- name就是包名，这个包下的 所有logger 输出就以下配置（这里的logger只会输出代码里 你指定打印的log ） --> <!-- name就是包名，这个包下的 所有logger 输出就以下配置（这里的logger只会输出代码里 你指定打印的log ） -->
<!-- <logger name="com.cnbm.pathwork" additivity="false">-->
<!-- <appender-ref ref="WORKING_DEBUG_FILE" />-->
<!-- <appender-ref ref="WORKING_INFO_FILE" />-->
<!-- <appender-ref ref="WORKING_WARN_FILE" />-->
<!-- <appender-ref ref="WORKING_ERROR_FILE" />-->
<!-- </logger>-->
<logger name="com.cnbm.dispatch" additivity="false"> <logger name="com.cnbm.dispatch" additivity="false">
<appender-ref ref="EQ_COMM_LOG_DEBUG_FILE" /> <appender-ref ref="EQ_COMM_LOG_DEBUG_FILE" />
<appender-ref ref="EQ_COMM_LOG_INFO_FILE" /> <appender-ref ref="EQ_COMM_LOG_INFO_FILE" />

439
ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
View File

@ -8,14 +8,12 @@ import com.cnbm.dispatch.enums.kuka.step2.Step2Plc2MesVar;
import com.cnbm.dispatch.enums.kuka.step3.Step3Mes2PlcVar; import com.cnbm.dispatch.enums.kuka.step3.Step3Mes2PlcVar;
import com.cnbm.dispatch.enums.kuka.step3.Step3Plc2MesVar; import com.cnbm.dispatch.enums.kuka.step3.Step3Plc2MesVar;
import com.cnbm.packing.dto.CamlineExtendArgDTO; import com.cnbm.packing.dto.CamlineExtendArgDTO;
import com.cnbm.packing.dto.CamlineSubIdDTO;
import com.cnbm.packing.entity.WoPackagingBox; import com.cnbm.packing.entity.WoPackagingBox;
import com.cnbm.packing.entity.WoPackagingBoxSubstrate; import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
import com.cnbm.packing.entity.WoPowerLevel; import com.cnbm.packing.entity.WoPowerLevel;
import com.cnbm.packing.service.*; import com.cnbm.packing.service.*;
import com.cnbm.s7.s7connector.enmuc.S7Client; import com.cnbm.s7.s7connector.enmuc.S7Client;
import com.cnbm.s7.s7connector.type.PlcVar; import com.cnbm.s7.s7connector.type.PlcVar;
import io.swagger.models.auth.In;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -24,8 +22,6 @@ import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.text.DecimalFormat;
import java.text.Format;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.util.Arrays; import java.util.Arrays;
import java.util.Date; import java.util.Date;
@ -69,7 +65,6 @@ public class KukaJoinThread implements ApplicationRunner {
/** /**
* return * return
* 成功： 返回相应的object对象 * 成功： 返回相应的object对象
@ -154,260 +149,198 @@ public class KukaJoinThread implements ApplicationRunner {
public String getBoxId(String sapMaterial){ public String getBoxId(String sapMaterial){
Integer todayBoxNum = service.getTodayBoxNum(); Integer todayBoxNum = service.getTodayBoxNum();
String nowTime = DateUtil.format(new Date(), "yyMMdd"); String nowTime = DateUtil.format(new Date(), "yyMMdd");
String res = "301"+sapMaterial+nowTime+todayBoxNum;
todayBoxNum+=500;
String res = "301"+sapMaterial+nowTime+formateString(todayBoxNum);
return res; return res;
} }
public String removeKG(String str){
return str.substring(0,17);
}
public static void main(String[] args) {
Integer a = 102;
Format f1 = new DecimalFormat("000");
System.out.println(f1.format(a));
}
public String formateString(Integer a){
Format f1 = new DecimalFormat("000");
return f1.format(a);
}
@Override @Override
public void run(ApplicationArguments args) throws Exception { public void run(ApplicationArguments args) throws Exception {
// kukaStep1.scheduleAtFixedRate(new Runnable() { kukaStep1.scheduleAtFixedRate(new Runnable() {
// @Override @Override
// public void run() { public void run() {
// try { //调度开始
// // logger.info("");
// //调度开始 // logger.info("================= 现在开始执行 过程一 任务 ==================");
//// logger.info(""); Integer subArrived = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, true);
//// logger.info("================= 现在开始执行 过程一 任务 =================="); if(subArrived != 1){
// Integer subArrived = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, true); logger.info("失败"+" --- "+" MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
// if(subArrived != 1){ }
// logger.info("标签打印Event--- 失败"+" --- "+" MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
// } //一. 从plc 中获取 subId 和 lineNum
// String subId = (String) read(S7Client.S7_KUKA,Step1Plc2MesVar.SubIdToMes);
// //一. 从plc 中获取 subId 和 lineNum Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step1Plc2MesVar.LineNum);
// String subId = (String) read(S7Client.S7_KUKA,Step1Plc2MesVar.SubIdToMes);
// Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step1Plc2MesVar.LineNum);
// //把基板ID字符串的空格去掉，因为plc中设置的20位，但实际基板ID就是17位，因为带空格去数据库查询 有问题的。 //二. MES 业务
// subId = removeKG(subId); //=============== MES 业务 开始 =================
// //1. 从comline数据库中获取 实际pmpp
// //二. MES 业务 float pmppBySubId = service.getPMPPBySubId(subId);
// //=============== MES 业务 开始 ================= //2. 匹配和计算补偿功率
// //1. 从comline数据库中获取 实际pmpp float actualPMPP = compensationPowerServiceBiz.calculCompensationPMPP(pmppBySubId,lineNum);
// float pmppBySubId = service.getPMPPBySubId(subId); //3. 依据补偿功率，获取工艺参数，并且把这些工艺参数传给kuka
// //2. 匹配和计算补偿功率 WoPowerLevel argByPMPP = levelServiceBiz.getArgByPMPP(actualPMPP, lineNum);
// float actualPMPP = compensationPowerServiceBiz.calculCompensationPMPP(pmppBySubId,lineNum); write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Pnom,Integer.valueOf(argByPMPP.getPowerClass()));
// //3. 依据补偿功率，获取工艺参数，并且把这些工艺参数传给kuka write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Voc,argByPMPP.getLableVoc());
// WoPowerLevel argByPMPP = levelServiceBiz.getArgByPMPP(actualPMPP, lineNum); write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,argByPMPP.getLableIsc());
// write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Pnom,Integer.valueOf(argByPMPP.getPowerClass())); write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,argByPMPP.getLableVmpp());
// write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Voc,argByPMPP.getLableVoc()); write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,argByPMPP.getLableImpp());
// write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,argByPMPP.getLableIsc()); logger.info("采集到 基板ID: "+subId+", 线边号："+lineNum+",dLable_Pnom: "+argByPMPP.getPowerClass() +",dLable_Voc: "+argByPMPP.getLableVoc()+",dLable_Isc: "+argByPMPP.getLableIsc()+",dLable_Vmpp: "+argByPMPP.getLableVmpp()+",dLable_Impp: "+argByPMPP.getLableImpp());
// write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,argByPMPP.getLableVmpp());
// write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,argByPMPP.getLableImpp());
// logger.info("标签打印Event--- 采集到 基板ID: "+subId+", 线边号："+lineNum+"，从camline 获取到实际pmpp"+pmppBySubId+",计算后 补偿功率："+actualPMPP+",dLable_Pnom: "+argByPMPP.getPowerClass() +",dLable_Voc: "+argByPMPP.getLableVoc()+",dLable_Isc: "+argByPMPP.getLableIsc()+",dLable_Vmpp: "+argByPMPP.getLableVmpp()+",dLable_Impp: "+argByPMPP.getLableImpp()); //4. 把基板录到数据库
// WoPackagingBoxSubstrate woPackagingBoxSubstrate = new WoPackagingBoxSubstrate();
// woPackagingBoxSubstrate.setLineBody(lineNum);
// woPackagingBoxSubstrate.setPowerLevel(argByPMPP.getPowerClass());
// //4. 把基板录到数据库 woPackagingBoxSubstrate.setSapMaterial(argByPMPP.getSapMaterialNum());
// WoPackagingBoxSubstrate woPackagingBoxSubstrate = new WoPackagingBoxSubstrate(); woPackagingBoxSubstrate.setWoSubstrateId(subId);
// woPackagingBoxSubstrate.setLineBody(lineNum);
// woPackagingBoxSubstrate.setPowerLevel(argByPMPP.getPowerClass()); //5. 从camline那里获取可变字段
// woPackagingBoxSubstrate.setSapMaterial(argByPMPP.getSapMaterialNum()); CamlineExtendArgDTO extendArgFromCamline = service.getExtendArgFromCamline(subId);
// woPackagingBoxSubstrate.setWoSubstrateId(subId); woPackagingBoxSubstrate.setLastUpdateTime(extendArgFromCamline.getLastUpdateTime());
// woPackagingBoxSubstrate.setActualPmpp(pmppBySubId); woPackagingBoxSubstrate.setPmpp(actualPMPP);
// woPackagingBoxSubstrate.setCreateTime(LocalDateTime.now()); woPackagingBoxSubstrate.setOrderName(extendArgFromCamline.getOrderName());
// woPackagingBoxSubstrate.setBinclassFl1(extendArgFromCamline.getBinclassFl1());
// woPackagingBoxSubstrate.setBinclassFl2(extendArgFromCamline.getBinclassFl2());
// //5. 从camline那里获取可变字段 woPackagingBoxSubstrate.setEtaFl1(extendArgFromCamline.getEtaFl1());
// CamlineExtendArgDTO extendArgFromCamline = service.getExtendArgFromCamline(subId); woPackagingBoxSubstrate.setEtaFl2(extendArgFromCamline.getEtaFl2());
// logger.info("标签打印Event--- 基板ID: "+subId+", 从camline获取PID16~PID22 的实测数据 成功, 数据内容:"+extendArgFromCamline.toString()); woPackagingBoxSubstrate.setFfFl1(extendArgFromCamline.getFfFl1());
// woPackagingBoxSubstrate.setLastUpdateTime(extendArgFromCamline.getLastUpdateTime()); woPackagingBoxSubstrate.setFfFl2(extendArgFromCamline.getFfFl2());
// woPackagingBoxSubstrate.setPmpp(actualPMPP); woPackagingBoxSubstrate.setImppFl1(extendArgFromCamline.getImppFl1());
// woPackagingBoxSubstrate.setOrderName(extendArgFromCamline.getOrderName()); woPackagingBoxSubstrate.setImppFl2(extendArgFromCamline.getImppFl2());
// woPackagingBoxSubstrate.setBinclassFl1(extendArgFromCamline.getBinclassFl1()); woPackagingBoxSubstrate.setInsolflashcontrolFl1(extendArgFromCamline.getInsolflashcontrolFl1());
// woPackagingBoxSubstrate.setBinclassFl2(extendArgFromCamline.getBinclassFl2()); woPackagingBoxSubstrate.setInsolflashcontrolFl2(extendArgFromCamline.getInsolflashcontrolFl2());
// woPackagingBoxSubstrate.setEtaFl1(extendArgFromCamline.getEtaFl1()); woPackagingBoxSubstrate.setInsolmppFl1(extendArgFromCamline.getInsolmppFl1());
// woPackagingBoxSubstrate.setEtaFl2(extendArgFromCamline.getEtaFl2()); woPackagingBoxSubstrate.setInsolmppFl2(extendArgFromCamline.getInsolmppFl2());
// woPackagingBoxSubstrate.setFfFl1(extendArgFromCamline.getFfFl1()); woPackagingBoxSubstrate.setInsolvocFl1(extendArgFromCamline.getInsolvocFl1());
// woPackagingBoxSubstrate.setFfFl2(extendArgFromCamline.getFfFl2()); woPackagingBoxSubstrate.setInsolvocFl2(extendArgFromCamline.getInsolvocFl2());
// woPackagingBoxSubstrate.setImppFl1(extendArgFromCamline.getImppFl1()); woPackagingBoxSubstrate.setInsolFl1(extendArgFromCamline.getInsolFl1());
// woPackagingBoxSubstrate.setImppFl2(extendArgFromCamline.getImppFl2()); woPackagingBoxSubstrate.setInsolFl2(extendArgFromCamline.getInsolFl2());
// woPackagingBoxSubstrate.setInsolflashcontrolFl1(extendArgFromCamline.getInsolflashcontrolFl1()); woPackagingBoxSubstrate.setIscFl1(extendArgFromCamline.getIscFl1());
// woPackagingBoxSubstrate.setInsolflashcontrolFl2(extendArgFromCamline.getInsolflashcontrolFl2()); woPackagingBoxSubstrate.setIscFl2(extendArgFromCamline.getIscFl2());
// woPackagingBoxSubstrate.setInsolmppFl1(extendArgFromCamline.getInsolmppFl1()); woPackagingBoxSubstrate.setMeasTimeFl1(extendArgFromCamline.getMeasTimeFl1());
// woPackagingBoxSubstrate.setInsolmppFl2(extendArgFromCamline.getInsolmppFl2()); woPackagingBoxSubstrate.setMeasTimeFl2(extendArgFromCamline.getMeasTimeFl2());
// woPackagingBoxSubstrate.setInsolvocFl1(extendArgFromCamline.getInsolvocFl1()); woPackagingBoxSubstrate.setPmppFl1(extendArgFromCamline.getPmppFl1());
// woPackagingBoxSubstrate.setInsolvocFl2(extendArgFromCamline.getInsolvocFl2()); woPackagingBoxSubstrate.setPmppFl2(extendArgFromCamline.getPmppFl2());
// woPackagingBoxSubstrate.setInsolFl1(extendArgFromCamline.getInsolFl1()); woPackagingBoxSubstrate.setTcellFl1(extendArgFromCamline.getTcellFl1());
// woPackagingBoxSubstrate.setInsolFl2(extendArgFromCamline.getInsolFl2()); woPackagingBoxSubstrate.setTcellFl2(extendArgFromCamline.getTcellFl2());
// woPackagingBoxSubstrate.setIscFl1(extendArgFromCamline.getIscFl1()); woPackagingBoxSubstrate.setTmonicellFl1(extendArgFromCamline.getTmonicellFl1());
// woPackagingBoxSubstrate.setIscFl2(extendArgFromCamline.getIscFl2()); woPackagingBoxSubstrate.setTmonicellFl2(extendArgFromCamline.getTmonicellFl2());
// woPackagingBoxSubstrate.setMeasTimeFl1(extendArgFromCamline.getMeasTimeFl1()); woPackagingBoxSubstrate.setUmppFl1(extendArgFromCamline.getUmppFl1());
// woPackagingBoxSubstrate.setMeasTimeFl2(extendArgFromCamline.getMeasTimeFl2()); woPackagingBoxSubstrate.setUmppFl2(extendArgFromCamline.getUmppFl2());
// woPackagingBoxSubstrate.setPmppFl1(extendArgFromCamline.getPmppFl1()); woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl1());
// woPackagingBoxSubstrate.setPmppFl2(extendArgFromCamline.getPmppFl2()); woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl2());
// woPackagingBoxSubstrate.setTcellFl1(extendArgFromCamline.getTcellFl1());
// woPackagingBoxSubstrate.setTcellFl2(extendArgFromCamline.getTcellFl2()); substrateServiceBiz.insert(woPackagingBoxSubstrate);
// woPackagingBoxSubstrate.setTmonicellFl1(extendArgFromCamline.getTmonicellFl1()); //=============== MES 业务 结束 =================
// woPackagingBoxSubstrate.setTmonicellFl2(extendArgFromCamline.getTmonicellFl2());
// woPackagingBoxSubstrate.setUmppFl1(extendArgFromCamline.getUmppFl1()); //三. 当MES完成任务后，把MesToPlc.SubArrivedFinish变量置为true，告诉plc，我操作完成了
// woPackagingBoxSubstrate.setUmppFl2(extendArgFromCamline.getUmppFl2()); write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true);
// woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl1());
// woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl2()); //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
// Integer subArrived2 = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, false);
// substrateServiceBiz.insert(woPackagingBoxSubstrate); if(subArrived2 != 1){
// logger.info("标签打印Event--- 基板ID: "+subId+", 录入数据库成功"); logger.info("失败"+" --- "+"MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
// //=============== MES 业务 结束 ================= }
// write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,false);
// //三. 当MES完成任务后，把MesToPlc.SubArrivedFinish变量置为true，告诉plc，我操作完成了 }
// write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true); },1,1, TimeUnit.SECONDS);
// logger.info("标签打印Event--- 基板ID: "+subId+", SubArrivedFinish，置为true 成功");
// //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
// Integer subArrived2 = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, false); kukaStep2.scheduleAtFixedRate(new Runnable() {
// if(subArrived2 != 1){ @Override
// logger.info("标签打印Event--- 失败"+" --- "+"MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败"); public void run() {
// } //调度开始
//
// write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,false); Integer shelfIsFull = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, true);
// logger.info("标签打印Event--- 基板ID: "+subId+", SubArrivedFinish，置为 false 成功, Event1 成功结束"); if(shelfIsFull != 1){
// logger.info("失败"+" --- "+"MES监听 Step2Plc2MesVar.ShelfIsFull 是否 等于 1 失败");
// }catch (Throwable e){ }
// logger.info("标签打印Event--- :"+e.getMessage());
// } //一. 从plc 中获取 subIdList 和 lineNum
// } String[] subIdList = (String[])read(S7Client.S7_KUKA,Step2Plc2MesVar.SubIdList);
// },1,1, TimeUnit.SECONDS); // Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step2Plc2MesVar.LineNum);
// logger.info("获取到基板列表："+ Arrays.toString(subIdList));
//
// kukaStep2.scheduleAtFixedRate(new Runnable() { //二. MES 业务
// @Override //=============== MES 业务 开始 =================
// public void run() { //1.MES 生成BoxId
// try { if(subIdList.length<=0){
// logger.info("失败"+" --- "+"从plc里面获取到的基板列表 为空");
// //调度开始 }
// Integer shelfIsFull = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, true); WoPackagingBoxSubstrate bySubId = substrateServiceBiz.getBySubId(subIdList[0]);
// if(shelfIsFull != 1){ String boxId = getBoxId(bySubId.getSapMaterial());
// logger.info("BOXID生成Event-------失败"+" --- "+"MES监听 Step2Plc2MesVar.ShelfIsFull 是否 等于 1 失败"); logger.info("mes 生成的boxId :"+ boxId);
// } //2. 依次update 基板表，把boxId 赋予这些基板
// for(int i=0;i<subIdList.length;i++){
// //一. 从plc 中获取 subIdList 和 lineNum substrateServiceBiz.updatePackagingBoxIdByWoSubstrateId(boxId,subIdList[i]);
// String[] subIdList = (String[])read(S7Client.S7_KUKA,Step2Plc2MesVar.SubIdList); }
// Integer listSize = (Integer)read(S7Client.S7_KUKA,Step2Plc2MesVar.PackageNumberSet); //3.去camline数据库 查询此基板ID 对应的订单
// String orderNameBySubId = service.getOrderNameBySubId(subIdList[0]);
// //二. MES 业务 //4. box信息录入到box表
// //=============== MES 业务 开始 ================= WoPackagingBox woPackagingBox = new WoPackagingBox();
// //1.MES 生成BoxId woPackagingBox.setBoxNo(boxId);
// if(subIdList.length<=0){ woPackagingBox.setPackagingTime(LocalDateTime.now());
// logger.info("BOXID生成Event-------失败"+" --- "+"从plc里面获取到的基板列表 为空"); woPackagingBox.setPowerLevel(bySubId.getPowerLevel());
// throw new Exception("BOXID生成Event-------kuka机械手 取到了空箱"); woPackagingBox.setLineBody(bySubId.getLineBody());
// } woPackagingBox.setSapMaterial(bySubId.getSapMaterial());
// //真实的基板ID 就是17位的，plc读取过来，有空格，要把后面3位空格去掉就行了。 woPackagingBox.setOrderNum(orderNameBySubId);
// for(int i=0;i<subIdList.length;i++){ //1-手动模式，2-自动模式
// subIdList[i] = removeKG(subIdList[i]); woPackagingBox.setModel(2);
// } woPackagingBox.setCreateTime(LocalDateTime.now());
// logger.info("BOXID生成Event-------获取到基板列表："+ Arrays.toString(subIdList)+",基板数量:"+listSize); boxServiceBiz.insert(woPackagingBox);
// //=============== MES 业务 结束 =================
// WoPackagingBoxSubstrate bySubId = substrateServiceBiz.getBySubId(subIdList[0]);
// //如果我们系统中找不到这块基板那么就去camline里面找 //三. 把生成的BoxId 告诉kuka
// if(bySubId == null){ write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,boxId);
// //todo
// CamlineSubIdDTO subIdByCamline = service.getSubIdByCamline(subIdList[0]); //四. 当MES完成任务后，把MesToPlc.ShelfIsFullFinish变量置为true，告诉plc，我操作完成了
// bySubId = new WoPackagingBoxSubstrate(); write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,true);
// bySubId.setPowerLevel(subIdByCamline.getPowerLevel());
// bySubId.setSapMaterial(subIdByCamline.getSapMaterial()); //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
// bySubId.setLineBody(2); Integer subArrived2 = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, false);
// } if(subArrived2 != 1){
// logger.info("失败"+" --- "+"步骤1. MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
// }
// String boxId = getBoxId(bySubId.getSapMaterial()); write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false);
// logger.info("BOXID生成Event-------mes 生成的boxId :"+ boxId); }
// //2. 依次update 基板表，把boxId 赋予这些基板 },1,1, TimeUnit.SECONDS);
// for(int i=0;i<listSize;i++){
// substrateServiceBiz.updatePackagingBoxIdAndSlotByWoSubstrateId(boxId,(i+1),subIdList[i]);
// } kukaStep3.scheduleAtFixedRate(new Runnable() {
// //3.去camline数据库 查询此基板ID 对应的订单 @Override
// String orderNameBySubId = service.getOrderNameBySubId(subIdList[0]); public void run() {
// //4. box信息录入到box表 //调度开始
// WoPackagingBox woPackagingBox = new WoPackagingBox(); Integer shelfIsFull = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, true);
// woPackagingBox.setBoxNo(boxId); if(shelfIsFull != 1){
// woPackagingBox.setPackagingTime(LocalDateTime.now()); logger.info("失败"+" --- "+"MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
// woPackagingBox.setPowerLevel(bySubId.getPowerLevel()); }
// woPackagingBox.setLineBody(bySubId.getLineBody());
// woPackagingBox.setSapMaterial(bySubId.getSapMaterial()); //一. 从plc 中获取 subIdList 和 lineNum
// woPackagingBox.setOrderNum(orderNameBySubId); String boxId = (String)read(S7Client.S7_KUKA,Step3Plc2MesVar.BoxId);
// //1-手动模式，2-自动模式 Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step3Plc2MesVar.LineNum);
// woPackagingBox.setModel(2); logger.info("到达站台的boxId :"+boxId);
// woPackagingBox.setCreateTime(LocalDateTime.now());
// boxServiceBiz.insert(woPackagingBox); //二. MES 业务
// logger.info("BOXID生成Event-------boxId :"+ boxId+"写入数据库成功"); //=============== MES 业务 开始 =================
// //=============== MES 业务 结束 ================= //1. box信息录入到box表
// boxServiceBiz.updateIsArrivedByBoxNo(1,boxId);
// //三. 把生成的BoxId 告诉kuka //=============== MES 业务 结束 =================
// write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,boxId);
// logger.info("BOXID生成Event-------boxId :"+ boxId+"传给PLC 成功");
// //四. 当MES完成任务后，把MesToPlc.ShelfIsFullArrivedFinish变量置为true，告诉plc，我操作完成了
// //四. 当MES完成任务后，把MesToPlc.ShelfIsFullFinish变量置为true，告诉plc，我操作完成了 write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true);
// write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,true);
// logger.info("BOXID生成Event-------boxId :"+ boxId+"ShelfIsFullFinish 置为true 成功"); //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
// //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false Integer subArrived2 = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, false);
// Integer subArrived2 = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, false); if(subArrived2 != 1){
// if(subArrived2 != 1){ logger.info("失败"+" --- "+"步骤1. MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
// logger.info("BOXID生成Event-------失败"+" --- "+"步骤1. MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败"); }
// } write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,false);
// write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false);
// logger.info("BOXID生成Event-------boxId :"+ boxId+"ShelfIsFullFinish 置为false 成功,Event2 成功结束");
// }catch (Throwable e){ }
// logger.info("BOXID生成Event------- :" + e.getMessage()); },1,1, TimeUnit.SECONDS);
// }
// }
// },1,1, TimeUnit.SECONDS);
//
//
// kukaStep3.scheduleAtFixedRate(new Runnable() {
// @Override
// public void run() {
// try {
//
// //调度开始
// Integer shelfIsFull = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, true);
// if(shelfIsFull != 1){
// logger.info("装箱单打印Event------失败"+" --- "+"MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
// }
//
// //一. 从plc 中获取 subIdList 和 lineNum
// String boxId = (String)read(S7Client.S7_KUKA,Step3Plc2MesVar.BoxId);
// Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step3Plc2MesVar.LineNum);
// logger.info("装箱单打印Event------到达站台的boxId :"+boxId);
//
// //二. MES 业务
// //=============== MES 业务 开始 =================
// //1. box信息录入到box表
// boxServiceBiz.updateIsArrivedByBoxNo(1,boxId);
// logger.info("装箱单打印Event------boxId :"+boxId+"更新数据库成功");
// //=============== MES 业务 结束 =================
//
//
// //四. 当MES完成任务后，把MesToPlc.ShelfIsFullArrivedFinish变量置为true，告诉plc，我操作完成了
// write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true);
// logger.info("装箱单打印Event------boxId :"+boxId+"， ShelfIsFullArrivedFinish置为true 成功");
// //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
// Integer subArrived2 = waitingForTarget(Step3Plc2MesVar.ShelfIsFullArrived, false);
// if(subArrived2 != 1){
// logger.info("装箱单打印Event------失败"+" --- "+"步骤1. MES监听 Step3Plc2MesVar.ShelfIsFullArrived 是否 等于 1 失败");
// }
// logger.info("装箱单打印Event------boxId :"+boxId+"， 监听到subArrived=false 成功");
// write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,false);
// logger.info("装箱单打印Event------boxId :"+boxId+"， Even3 成功");
// }catch (Throwable e){
// logger.info("装箱单打印Event------"+e.getMessage());
// }
//
// }
// },1,1, TimeUnit.SECONDS);
} }

4
ym-packing/src/main/java/com/cnbm/dispatch/enums/kuka/step2/Step2Plc2MesVar.java
View File

@ -14,9 +14,7 @@ public enum Step2Plc2MesVar {
ShelfIsFull("ShelfIsFull", PlcVar.BOOL,1, DaveArea.DB,2000,48,0), ShelfIsFull("ShelfIsFull", PlcVar.BOOL,1, DaveArea.DB,2000,48,0),
SubIdList("SubIdList",PlcVar.STRING_Array,30,DaveArea.DB,2000,50,0,20), SubIdList("SubIdList",PlcVar.STRING_Array,30,DaveArea.DB,2000,50,0,20),
LineNum("LineNum", PlcVar.UINT,1, DaveArea.DB,2000,710,0), LineNum("LineNum", PlcVar.BOOL,1, DaveArea.DB,2000,710,0),
PackageNumberSet("PackageNumberSet", PlcVar.UINT,1, DaveArea.DB,2000,766,0),
; ;
private String name; private String name;

74
ym-packing/src/main/java/com/cnbm/packing/controller/TestController.java
View File

@ -1,28 +1,18 @@
package com.cnbm.packing.controller; package com.cnbm.packing.controller;
import com.cnbm.admin.annotation.LogOperation;
import com.cnbm.dispatch.enums.kuka.step1.Step1Mes2PlcVar; import com.cnbm.dispatch.enums.kuka.step1.Step1Mes2PlcVar;
import com.cnbm.dispatch.enums.kuka.step1.Step1Plc2MesVar; import com.cnbm.dispatch.enums.kuka.step1.Step1Plc2MesVar;
import com.cnbm.dispatch.enums.kuka.step2.Step2Mes2PlcVar; import com.cnbm.dispatch.enums.kuka.step2.Step2Mes2PlcVar;
import com.cnbm.dispatch.enums.kuka.step2.Step2Plc2MesVar; import com.cnbm.dispatch.enums.kuka.step2.Step2Plc2MesVar;
import com.cnbm.dispatch.enums.kuka.step3.Step3Mes2PlcVar; import com.cnbm.dispatch.enums.kuka.step3.Step3Mes2PlcVar;
import com.cnbm.dispatch.enums.kuka.step3.Step3Plc2MesVar; import com.cnbm.dispatch.enums.kuka.step3.Step3Plc2MesVar;
import com.cnbm.packing.dto.CamlineSubIdDTO;
import com.cnbm.packing.dto.CamlineSubIdForImportDTO;
import com.cnbm.packing.dto.PowerReportDTO;
import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
import com.cnbm.packing.param.PowerReportQueryParam;
import com.cnbm.packing.service.DynamicDataSourceService; import com.cnbm.packing.service.DynamicDataSourceService;
import com.cnbm.packing.service.WoPackagingBoxServiceBiz;
import com.cnbm.packing.service.WoPackagingBoxSubstrateServiceBiz;
import com.cnbm.packing.vo.PowerReportVo;
import com.cnbm.s7.entity.R; import com.cnbm.s7.entity.R;
import com.cnbm.s7.s7connector.enmuc.S7Client; import com.cnbm.s7.s7connector.enmuc.S7Client;
import com.cnbm.s7.s7connector.type.PlcVar; import com.cnbm.s7.s7connector.type.PlcVar;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -32,10 +22,7 @@ import springfox.documentation.annotations.ApiIgnore;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.text.ParseException; import java.text.ParseException;
import java.util.Arrays;
import java.util.List;
import java.util.Map; import java.util.Map;
@ -52,12 +39,6 @@ public class TestController {
private static final Logger logger = LoggerFactory.getLogger(TestController.class); private static final Logger logger = LoggerFactory.getLogger(TestController.class);
@Autowired @Autowired
DynamicDataSourceService service; DynamicDataSourceService service;
@Autowired
WoPackagingBoxSubstrateServiceBiz substrateServiceBiz;
@Autowired
WoPackagingBoxServiceBiz boxServiceBiz;
private Object read(S7Client s7Client,Step1Plc2MesVar var) throws UnsupportedEncodingException, ParseException { private Object read(S7Client s7Client,Step1Plc2MesVar var) throws UnsupportedEncodingException, ParseException {
try { try {
return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType()); return s7Client.read(var.getArea(), var.getAreaNumber(), var.getByteOffset(), var.getBitOffset(), var.getLength(), var.getStrSize(), var.getType());
@ -114,28 +95,6 @@ public class TestController {
return null; return null;
} }
} }
@PostMapping("/forString")
public R forString() throws UnsupportedEncodingException, ParseException {
String[] s = (String[])read(S7Client.S7_KUKA,Step2Plc2MesVar.SubIdList);
System.out.println(Step2Plc2MesVar.SubIdList.getName()+" : "+Arrays.toString(s));
return R.ok();
}
@PostMapping("/forImport")
public R forImport() throws UnsupportedEncodingException, ParseException {
List<CamlineSubIdForImportDTO> alllCamlineSubForImp = service.getAlllCamlineSubForImp();
for(CamlineSubIdForImportDTO cam:alllCamlineSubForImp){
WoPackagingBoxSubstrate woPackagingBoxSubstrate = new WoPackagingBoxSubstrate();
woPackagingBoxSubstrate.setWoSubstrateId(cam.getSubId());
woPackagingBoxSubstrate.setLineBody(2);
woPackagingBoxSubstrate.setPowerLevel(cam.getPowerLevel());
woPackagingBoxSubstrate.setOrderName(cam.getOrderName());
woPackagingBoxSubstrate.setSapMaterial(cam.getSapMaterial());
substrateServiceBiz.insert(woPackagingBoxSubstrate);
}
return R.ok();
}
@PostMapping("/testReadAll") @PostMapping("/testReadAll")
public R testReadAll() throws UnsupportedEncodingException, ParseException { public R testReadAll() throws UnsupportedEncodingException, ParseException {
@ -180,32 +139,17 @@ public class TestController {
BigDecimal vmpp = new BigDecimal(46.799); BigDecimal vmpp = new BigDecimal(46.799);
BigDecimal impp = new BigDecimal(3.0799); BigDecimal impp = new BigDecimal(3.0799);
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Pnom,new Integer(1)); write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Pnom,new Integer(1));
System.out.println(Step1Mes2PlcVar.dLable_Pnom.getName()+" : "+1);
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Voc,voc); write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Voc,voc);
System.out.println(Step1Mes2PlcVar.dLable_Voc.getName()+" : "+voc.toPlainString());
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,isc); write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,isc);
System.out.println(Step1Mes2PlcVar.dLable_Isc.getName()+" : "+isc.toPlainString());
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,vmpp); write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,vmpp);
System.out.println(Step1Mes2PlcVar.dLable_Vmpp.getName()+" : "+vmpp.toPlainString());
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,impp); write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,impp);
System.out.println(Step1Mes2PlcVar.dLable_Impp.getName()+" : "+impp.toPlainString());
write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,"12345678901111111111"); write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,"12345678901111111111");
System.out.println(Step2Mes2PlcVar.BoxId.getName()+" : "+"12345678901111111111");
write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true); write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true);
System.out.println(Step1Mes2PlcVar.SubArrivedFinish.getName()+" : "+"true");
write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false); write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false);
System.out.println(Step2Mes2PlcVar.ShelfIsFullFinish.getName()+" : "+"false");
write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true); write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true);
System.out.println(Step3Mes2PlcVar.ShelfIsFullArrivedFinish.getName()+" : "+"true");
return R.ok(); return R.ok();
@ -214,28 +158,10 @@ public class TestController {
public R testlogger() { public R testlogger() {
logger.info("test logger"); logger.info("test logger");
System.out.println("test logger"); System.out.println("test logger");
// CamlineSubIdDTO subIdByCamline = service.getSubIdByCamline("30110012302220591");
// CamlineSubIdDTO subIdByCamline2 = service.getSubIdByCamline("30110012302220591 ");
// System.out.println("subIdByCamline: "+subIdByCamline.toString());
// System.out.println("subIdByCamline2: "+subIdByCamline2.toString());
// WoPackagingBoxSubstrate bySubId = substrateServiceBiz.getBySubId("30110012302220591 ");
// System.out.println("bySubId: "+bySubId.toString());
WoPackagingBoxSubstrate bySubId = substrateServiceBiz.getBySubId("30110012302210707 ");
if(bySubId == null){
//todo
CamlineSubIdDTO subIdByCamline = service.getSubIdByCamline("30110012302220591 ");
bySubId = new WoPackagingBoxSubstrate();
bySubId.setPowerLevel(subIdByCamline.getPowerLevel());
bySubId.setSapMaterial(subIdByCamline.getSapMaterial());
System.out.println("bySubId2 : "+bySubId.toString());
}
return R.ok(); return R.ok();
} }
@PostMapping("getPMPPBySubId") @PostMapping("getPMPPBySubId")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "subId", value = "基板ID", paramType = "query", required = true, dataTypeClass=Integer.class) , @ApiImplicitParam(name = "subId", value = "基板ID", paramType = "query", required = true, dataTypeClass=Integer.class) ,

61
ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java
View File

@ -13,30 +13,24 @@ import com.cnbm.common.validator.group.AddGroup;
import com.cnbm.common.validator.group.DefaultGroup; import com.cnbm.common.validator.group.DefaultGroup;
import com.cnbm.common.validator.group.UpdateGroup; import com.cnbm.common.validator.group.UpdateGroup;
import com.cnbm.packing.dto.ChangePackingBoxDTO; import com.cnbm.packing.dto.ChangePackingBoxDTO;
import com.cnbm.packing.dto.PowerReportDTO;
import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO; import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO;
import com.cnbm.packing.entity.WoPackagingBox; import com.cnbm.packing.entity.WoPackagingBox;
import com.cnbm.packing.entity.WoPackagingBoxSubstrate; import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
import com.cnbm.packing.excel.WoPackagingBoxSubstrateExcel; import com.cnbm.packing.excel.WoPackagingBoxSubstrateExcel;
import com.cnbm.packing.mapper.WoPackagingBoxMapper; import com.cnbm.packing.mapper.WoPackagingBoxMapper;
import com.cnbm.packing.mapper.WoPackagingBoxSubstrateMapper; import com.cnbm.packing.mapper.WoPackagingBoxSubstrateMapper;
import com.cnbm.packing.param.PowerReportQueryParam;
import com.cnbm.packing.service.WoPackagingBoxServiceBiz;
import com.cnbm.packing.service.WoPackagingBoxSubstrateServiceBiz; import com.cnbm.packing.service.WoPackagingBoxSubstrateServiceBiz;
import com.cnbm.packing.vo.PowerReportVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.omg.CORBA.PRIVATE_MEMBER;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore; import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.text.DecimalFormat;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -54,9 +48,6 @@ public class WoPackagingBoxSubstrateController {
@Autowired @Autowired
private WoPackagingBoxSubstrateServiceBiz woPackagingBoxSubstrateService; private WoPackagingBoxSubstrateServiceBiz woPackagingBoxSubstrateService;
@Autowired
private WoPackagingBoxServiceBiz boxServiceBiz;
@Autowired @Autowired
private WoPackagingBoxSubstrateMapper woPackagingBoxSubstrateMapper; private WoPackagingBoxSubstrateMapper woPackagingBoxSubstrateMapper;
@ -102,16 +93,6 @@ public class WoPackagingBoxSubstrateController {
return new Result<Long>().ok(dto.getId()); return new Result<Long>().ok(dto.getId());
} }
// @PostMapping
// @ApiOperation("功率报表")
// @LogOperation("功率报表查询")
// public Result<List<PowerReportDTO>> powerReport(@RequestBody PowerReportQueryParam queryParam){
//
//
// List<PowerReportDTO> powerReportDTOS = boxServiceBiz.powerReport(queryParam.getOrderName(), queryParam.getBegin(), queryParam.getEnd());
// return new Result<List<PowerReportDTO>>().ok(powerReportDTOS);
// }
@PutMapping @PutMapping
@ApiOperation("修改") @ApiOperation("修改")
@LogOperation("修改") @LogOperation("修改")
@ -125,48 +106,6 @@ public class WoPackagingBoxSubstrateController {
return new Result<Long>().ok(dto.getId()); return new Result<Long>().ok(dto.getId());
} }
@ApiOperation("查询模组档位统计分布图")
@LogOperation("查询模组档位统计分布图")
@PostMapping("/powerReport")
public Result<PowerReportVo> powerReport(@RequestBody PowerReportQueryParam queryParam){
List<PowerReportDTO> powerReportDTOS = boxServiceBiz.powerReport(queryParam);
PowerReportVo powerReportVo = new PowerReportVo();
Float totalLevelPower = new Float(0);
Float totalCompensatePower = new Float(0);
Float diversePower = new Float(0);
Integer totalSubNum = 0;
for(PowerReportDTO power : powerReportDTOS){
Integer subLevel = Integer.valueOf(power.getSubLevel());
Integer subNum = power.getSubNum();
Float sumPMPP = power.getSumPMPP();
totalLevelPower += subLevel*subNum;
totalCompensatePower += sumPMPP*subNum;
totalSubNum+= subNum;
}
for(PowerReportDTO power : powerReportDTOS){
Float prop = Float.valueOf(power.getSubNum())/Float.valueOf(totalSubNum);
DecimalFormat df = new DecimalFormat("0.00");
String propS = df.format(prop)+"%";
power.setProportion(propS);
}
diversePower = totalLevelPower - totalCompensatePower;
powerReportVo.setPowerReports(powerReportDTOS);
powerReportVo.setDiversePower(diversePower);
powerReportVo.setTotalCompensatePower(totalCompensatePower);
powerReportVo.setTotalLevelPower(totalLevelPower);
return new Result<PowerReportVo>().ok(powerReportVo);
}
@ApiOperation("查询模组档位统计分布图-获取ordername列表")
@LogOperation("查询模组档位统计分布图-获取ordername列表")
@PostMapping("/orderNameList")
public Result<List<String>> orderNameList(){
List<String> powerReportDTOS = boxServiceBiz.orderNameList();
return new Result<List<String>>().ok(powerReportDTOS);
}
@DeleteMapping @DeleteMapping
@ApiOperation("删除") @ApiOperation("删除")
@LogOperation("删除") @LogOperation("删除")

30
ym-packing/src/main/java/com/cnbm/packing/dto/CamlineSubIdDTO.java
View File

@ -1,30 +0,0 @@
package com.cnbm.packing.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 打印标签模板表
*
* @author codeGenerator
* @since 2023-02-20
*/
@Data
@ApiModel(value = "camline 查询对象")
public class CamlineSubIdDTO implements Serializable {
private static final long serialVersionUID = 1L;
private String powerLevel;
private String sapMaterial;
}

28
ym-packing/src/main/java/com/cnbm/packing/dto/CamlineSubIdForImportDTO.java
View File

@ -1,28 +0,0 @@
package com.cnbm.packing.dto;
import io.swagger.annotations.ApiModel;
import lombok.Data;
import java.io.Serializable;
/**
* 打印标签模板表
*
* @author codeGenerator
* @since 2023-02-20
*/
@Data
@ApiModel(value = "camline 查询对象")
public class CamlineSubIdForImportDTO implements Serializable {
private static final long serialVersionUID = 1L;
private String subId;
private String powerLevel;
private String sapMaterial;
private String orderName;
}

34
ym-packing/src/main/java/com/cnbm/packing/dto/PowerReportDTO.java
View File

@ -1,34 +0,0 @@
package com.cnbm.packing.dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.time.LocalDateTime;
/**
* 包装箱基板关联表 ( 基板表 )
*
* @author codeGenerator
* @since 2023-02-21
*/
@Data
@ApiModel(value = "包装箱基板关联表 ( 基板表 )DTO对象")
public class PowerReportDTO implements Serializable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "subNum")
private Integer subNum;
@ApiModelProperty(value = "subLevel")
private String subLevel;
@ApiModelProperty(value = "sumPMPP")
private Float sumPMPP;
@ApiModelProperty(value = "占比（百分比）")
private String proportion;
}

6
ym-packing/src/main/java/com/cnbm/packing/mapper/CamlineMapper.java
View File

@ -1,8 +1,6 @@
package com.cnbm.packing.mapper; package com.cnbm.packing.mapper;
import com.cnbm.packing.dto.CamlineExtendArgDTO; import com.cnbm.packing.dto.CamlineExtendArgDTO;
import com.cnbm.packing.dto.CamlineSubIdDTO;
import com.cnbm.packing.dto.CamlineSubIdForImportDTO;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
@ -28,8 +26,4 @@ public interface CamlineMapper {
CamlineExtendArgDTO getExtendArgFromCamline(@Param("subId") String subId); CamlineExtendArgDTO getExtendArgFromCamline(@Param("subId") String subId);
Integer getTodayBoxNum(); Integer getTodayBoxNum();
CamlineSubIdDTO getSubIdByCamline(@Param("subId") String subId);
List<CamlineSubIdForImportDTO> getSubIdByCamlineForImpoet();
} }

13
ym-packing/src/main/java/com/cnbm/packing/mapper/WoPackagingBoxSubstrateMapper.java
View File

@ -1,15 +1,10 @@
package com.cnbm.packing.mapper; package com.cnbm.packing.mapper;
import com.cnbm.packing.dto.PowerReportDTO;
import com.cnbm.packing.param.PowerReportQueryParam;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import com.cnbm.common.dao.BaseDao; import com.cnbm.common.dao.BaseDao;
import com.cnbm.packing.entity.WoPackagingBoxSubstrate; import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.time.LocalDateTime;
import java.util.List;
/** /**
* 包装箱基板关联表 * 包装箱基板关联表
* *
@ -20,9 +15,5 @@ import java.util.List;
public interface WoPackagingBoxSubstrateMapper extends BaseDao<WoPackagingBoxSubstrate> { public interface WoPackagingBoxSubstrateMapper extends BaseDao<WoPackagingBoxSubstrate> {
WoPackagingBoxSubstrate getOneByWoSubstrateId(@Param("woSubstrateId") String woSubstrateId); WoPackagingBoxSubstrate getOneByWoSubstrateId(@Param("woSubstrateId") String woSubstrateId);
int updatePackagingBoxIdByWoSubstrateId(@Param("packagingBoxId") String packagingBoxId, @Param("woSubstrateId") String woSubstrateId);
int updatePackagingBoxIdAndSlotByWoSubstrateId(@Param("packagingBoxId") String packagingBoxId, @Param("slot") Integer slot, @Param("woSubstrateId") String woSubstrateId); }
List<PowerReportDTO> powerReport(@Param("queryParam") PowerReportQueryParam queryParam);
List<String> orderNameList();
}

20
ym-packing/src/main/java/com/cnbm/packing/param/PowerReportQueryParam.java
View File

@ -1,20 +0,0 @@
package com.cnbm.packing.param;
import lombok.Data;
import java.time.LocalDateTime;
/**
* @Desc: ""
* @Author: caixiang
* @DATE: 2023/2/15 19:05
*/
@Data
public class PowerReportQueryParam {
private LocalDateTime begin;
private LocalDateTime end;
private String orderName;
private Integer model;
}

14
ym-packing/src/main/java/com/cnbm/packing/service/DynamicDataSourceService.java
View File

@ -2,8 +2,6 @@ package com.cnbm.packing.service;
import com.cnbm.dynamic.datasource.annotation.DataSource; import com.cnbm.dynamic.datasource.annotation.DataSource;
import com.cnbm.packing.dto.CamlineExtendArgDTO; import com.cnbm.packing.dto.CamlineExtendArgDTO;
import com.cnbm.packing.dto.CamlineSubIdDTO;
import com.cnbm.packing.dto.CamlineSubIdForImportDTO;
import com.cnbm.packing.dto.WoPowerLevelDTO; import com.cnbm.packing.dto.WoPowerLevelDTO;
import com.cnbm.packing.mapper.CamlineMapper; import com.cnbm.packing.mapper.CamlineMapper;
@ -43,22 +41,10 @@ public class DynamicDataSourceService {
return mapper.getOrderNameBySubId(subId); return mapper.getOrderNameBySubId(subId);
} }
@DataSource("camline")
@Transactional
public CamlineSubIdDTO getSubIdByCamline(String subId){
return mapper.getSubIdByCamline(subId);
}
@DataSource("camline") @DataSource("camline")
@Transactional @Transactional
public CamlineExtendArgDTO getExtendArgFromCamline(String subId){ public CamlineExtendArgDTO getExtendArgFromCamline(String subId){
return mapper.getExtendArgFromCamline(subId); return mapper.getExtendArgFromCamline(subId);
} }
@DataSource("camline")
@Transactional
public List<CamlineSubIdForImportDTO> getAlllCamlineSubForImp(){
return mapper.getSubIdByCamlineForImpoet();
}
} }

7
ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java
View File

@ -3,13 +3,9 @@ package com.cnbm.packing.service;
import com.cnbm.common.page.PageData; import com.cnbm.common.page.PageData;
import com.cnbm.common.service.CrudService; import com.cnbm.common.service.CrudService;
import com.cnbm.packing.dto.IdVo; import com.cnbm.packing.dto.IdVo;
import com.cnbm.packing.dto.PowerReportDTO;
import com.cnbm.packing.dto.WoPackagingBoxDTO; import com.cnbm.packing.dto.WoPackagingBoxDTO;
import com.cnbm.packing.entity.WoPackagingBox; import com.cnbm.packing.entity.WoPackagingBox;
import com.cnbm.packing.param.PowerReportQueryParam;
import org.apache.ibatis.annotations.Param;
import java.time.LocalDateTime;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -37,7 +33,4 @@ public interface WoPackagingBoxServiceBiz extends CrudService<WoPackagingBox, Wo
int updateIsArrivedByBoxNo(Integer isArrived, String boxNo); int updateIsArrivedByBoxNo(Integer isArrived, String boxNo);
List<PowerReportDTO> powerReport(PowerReportQueryParam queryParam);
List<String> orderNameList();
} }

4
ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java
View File

@ -35,7 +35,5 @@ public interface WoPackagingBoxSubstrateServiceBiz extends CrudService<WoPackagi
void insertSubstrateManual(ChangePackingBoxDTO[] dtos); void insertSubstrateManual(ChangePackingBoxDTO[] dtos);
WoPackagingBoxSubstrate getBySubId(String subId); WoPackagingBoxSubstrate getBySubId(String subId);
int updatePackagingBoxIdByWoSubstrateId(String packagingBoxId,String woSubstrateId);
int updatePackagingBoxIdAndSlotByWoSubstrateId(String packagingBoxId,Integer slot,String woSubstrateId);
} }

7
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoCompensationPowerServiceBizImpl.java
View File

@ -98,11 +98,8 @@ public class WoCompensationPowerServiceBizImpl extends CrudServiceImpl<WoCompens
CompensationPowerXSDTO conffBySubIdAndLineBody = mapper.getConffBySubIdAndLineBody(compensationQueryParam); CompensationPowerXSDTO conffBySubIdAndLineBody = mapper.getConffBySubIdAndLineBody(compensationQueryParam);
if(conffBySubIdAndLineBody!=null){ float res = pmpp*conffBySubIdAndLineBody.getA()+conffBySubIdAndLineBody.getB();
return pmpp*conffBySubIdAndLineBody.getA()+conffBySubIdAndLineBody.getB(); return res;
}else {
return pmpp;
}
} }

13
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
View File

@ -8,13 +8,11 @@ import com.cnbm.common.page.PageData;
import com.cnbm.common.service.impl.CrudServiceImpl; import com.cnbm.common.service.impl.CrudServiceImpl;
import com.cnbm.common.utils.ConvertUtils; import com.cnbm.common.utils.ConvertUtils;
import com.cnbm.packing.dto.IdVo; import com.cnbm.packing.dto.IdVo;
import com.cnbm.packing.dto.PowerReportDTO;
import com.cnbm.packing.dto.WoPackagingBoxDTO; import com.cnbm.packing.dto.WoPackagingBoxDTO;
import com.cnbm.packing.entity.WoPackagingBox; import com.cnbm.packing.entity.WoPackagingBox;
import com.cnbm.packing.entity.WoPackagingBoxSubstrate; import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
import com.cnbm.packing.mapper.WoPackagingBoxMapper; import com.cnbm.packing.mapper.WoPackagingBoxMapper;
import com.cnbm.packing.mapper.WoPackagingBoxSubstrateMapper; import com.cnbm.packing.mapper.WoPackagingBoxSubstrateMapper;
import com.cnbm.packing.param.PowerReportQueryParam;
import com.cnbm.packing.service.WoPackagingBoxServiceBiz; import com.cnbm.packing.service.WoPackagingBoxServiceBiz;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -40,7 +38,6 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
@Autowired @Autowired
private WoPackagingBoxSubstrateMapper substrateMapper; private WoPackagingBoxSubstrateMapper substrateMapper;
@Override @Override
public QueryWrapper<WoPackagingBox> getWrapper(Map<String, Object> params){ public QueryWrapper<WoPackagingBox> getWrapper(Map<String, Object> params){
@ -130,14 +127,4 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl<WoPackagingBox
public int updateIsArrivedByBoxNo(Integer isArrived, String boxNo) { public int updateIsArrivedByBoxNo(Integer isArrived, String boxNo) {
return mapper.updateIsArrivedByBoxNo(isArrived,boxNo); return mapper.updateIsArrivedByBoxNo(isArrived,boxNo);
} }
@Override
public List<PowerReportDTO> powerReport(PowerReportQueryParam queryParam) {
return substrateMapper.powerReport(queryParam);
}
@Override
public List<String> orderNameList() {
return substrateMapper.orderNameList();
}
} }

4
ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
View File

@ -193,7 +193,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl<WoPac
} }
@Override @Override
public int updatePackagingBoxIdAndSlotByWoSubstrateId(String packagingBoxId, Integer slot , String woSubstrateId) { public int updatePackagingBoxIdByWoSubstrateId(String packagingBoxId, String woSubstrateId) {
return mapper.updatePackagingBoxIdAndSlotByWoSubstrateId(packagingBoxId,slot,woSubstrateId); return mapper.updatePackagingBoxIdByWoSubstrateId(packagingBoxId,woSubstrateId);
} }
} }

22
ym-packing/src/main/java/com/cnbm/packing/vo/PowerReportVo.java
View File

@ -1,22 +0,0 @@
package com.cnbm.packing.vo;
import com.cnbm.packing.dto.PowerReportDTO;
import lombok.Data;
import java.util.List;
/**
* @Desc: ""
* @Author: caixiang
* @DATE: 2023/3/6 9:34
*/
@Data
public class PowerReportVo {
private Float totalLevelPower;
private Float totalCompensatePower;
private Float diversePower;
private List<PowerReportDTO> powerReports;
}

119
ym-packing/src/main/resources/mapper/CamlineMapper.xml
View File

@ -7,17 +7,6 @@
<result column="platform_id" property="platformId" /> <result column="platform_id" property="platformId" />
<result column="create_time" property="createTime" /> <result column="create_time" property="createTime" />
</resultMap> </resultMap>
<resultMap id="ResultMapCam" type="com.cnbm.packing.dto.CamlineSubIdDTO">
<result column="power_level" property="powerLevel" />
<result column="sap_material" property="sapMaterial" />
</resultMap>
<resultMap id="ResultMapCamIm" type="com.cnbm.packing.dto.CamlineSubIdForImportDTO">
<result column="power_level" property="powerLevel" />
<result column="sap_material" property="sapMaterial" />
<result column="sub_id" property="subId" />
<result column="order_name" property="orderName" />
</resultMap>
<resultMap id="ResultAMap" type="com.cnbm.packing.dto.CamlineExtendArgDTO"> <resultMap id="ResultAMap" type="com.cnbm.packing.dto.CamlineExtendArgDTO">
<result column="LAST_UPDATE_TIME" property="lastUpdateTime" /> <result column="LAST_UPDATE_TIME" property="lastUpdateTime" />
<result column="PMPP" property="pmpp" /> <result column="PMPP" property="pmpp" />
@ -64,15 +53,16 @@
<select id="getPMPPBySubId" resultType="float"> <select id="getPMPPBySubId" resultType="float">
SELECT SELECT
flr.PMPP_FL2 as PMPP flc.PMPP
FROM FROM
ue_flasher_data_raw flr ue_flasher_data_calc flc
LEFT JOIN e_tracking_unit tu ON flr.mainid = tu.id LEFT JOIN e_tracking_unit tu ON flc.mainid = tu.id
WHERE WHERE
flr.PMPP_FL2 != 0 flc.PMPP != 0
and tu.name=#{subId} -- 查特定基板功率 and
tu.name=#{subId} -- 查特定基板功率
ORDER BY ORDER BY
flr.LAST_UPDATE_TIME DESC flc.LAST_UPDATE_TIME DESC
LIMIT 1 LIMIT 1
</select> </select>
@ -128,101 +118,6 @@
LIMIT 1 LIMIT 1
</select> </select>
<select id="getSubIdByCamline" resultMap="ResultMapCam">
SELECT
flc.SAP_Material as sap_material,
flc.Nenn_Leistung as power_level
FROM
ue_flasher_data_calc flc
LEFT JOIN e_tracking_unit tu ON flc.mainid = tu.id
WHERE
flc.PMPP != 0
and tu.name = #{subId}
</select>
<select id="getSubIdByCamlineForImpoet" resultMap="ResultMapCamIm">
SELECT
tu.`NAME` as sub_id,-- DMC
flc.SAP_Material as sap_material,
flc.Nenn_Leistung as power_level,
eo.`NAME` as order_name
FROM
ue_flasher_data_calc flc
LEFT JOIN e_tracking_unit tu ON flc.mainid = tu.id
LEFT JOIN er_order eo ON tu.ORDER_ID = eo.ID
WHERE
tu.NAME IN (
'30110012302272191',
'30110012302131618',
'30110012303012944',
'30110012303020207',
'30110012302241261',
'30110012302241398',
'30110012302230861',
'30110012302233064',
'30110012302281480',
'30110012302282683',
'30110012302240071',
'30110012302250901',
'30110012303011030',
'30110012302250913',
'30110012302270254',
'30110012302092199',
'30110012303020200',
'30110012303012545',
'30110012302142542',
'30110012302232978',
'30110012303020850',
'30110012303020177',
'30110012302250223',
'30110012302232990',
'30110012303013332',
'30110012302232986',
'30110012302232985',
'30110012302284455',
'30110012302233312',
'30110012303020358',
'30110012302282341',
'30110012303020199',
'30110012302272331',
'30110012303021196',
'30110012302233336',
'30110012303020006',
'30110012302242395',
'30110012302233328',
'30110012303012521',
'30110012302233506',
'30110012302242632',
'30110012302233332',
'30110012302232981',
'30110012303020183',
'30110012302283758',
'30110012302280081',
'30110012303020128',
'30110012302241074',
'30110012303020008',
'30110012303020088',
'30110012302232982',
'30110012303012916',
'30110012302230019',
'30110012302271634',
'30110012302251127',
'30110012302230021',
'30110012303010971',
'30110012302251123',
'30110012302140610'
)
and flc.PMPP != 0
GROUP BY tu.`NAME`
</select>
<select id="getOrderNameBySubId" resultType="string"> <select id="getOrderNameBySubId" resultType="string">
SELECT SELECT
eorder.name eorder.name

2
ym-packing/src/main/resources/mapper/WoCompensationPowerMapper.xml
View File

@ -41,7 +41,7 @@
and twcp.line_body = #{param.lineBody} and twcp.line_body = #{param.lineBody}
</if> </if>
<if test="param.pmpp != null"> <if test="param.pmpp != null">
and twcp.actl_pmpp_high <![CDATA[ > ]]> #{param.pmpp} and twcp.actl_pmpp_low <![CDATA[ <= ]]> #{param.pmpp} and twcp.actl_pmpp_high <![CDATA[ >= ]]> #{param.pmpp} and twcp.actl_pmpp_low <![CDATA[ <= ]]> #{param.pmpp}
</if> </if>
</select> </select>

44
ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml
View File

@ -53,13 +53,6 @@
<id column="UOC_FL2" property="uocFl2" /> <id column="UOC_FL2" property="uocFl2" />
</resultMap> </resultMap>
<resultMap id="ResultMapPowerRe" type="com.cnbm.packing.dto.PowerReportDTO">
<result column="sub_num" property="subNum" />
<result column="sub_level" property="subLevel" />
<result column="sum_pmpp" property="sumPMPP" />
</resultMap>
<select id="list" resultType="com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO"> <select id="list" resultType="com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO">
select * from t_wo_packaging_box_substrate select * from t_wo_packaging_box_substrate
<where> <where>
@ -79,44 +72,11 @@
WO_SUBSTRATE_ID = #{woSubstrateId,jdbcType=VARCHAR} WO_SUBSTRATE_ID = #{woSubstrateId,jdbcType=VARCHAR}
limit 1 limit 1
</select> </select>
<update id="updatePackagingBoxIdByWoSubstrateId">
<update id="updatePackagingBoxIdAndSlotByWoSubstrateId">
update t_wo_packaging_box_substrate update t_wo_packaging_box_substrate
set PACKAGING_BOX_ID = #{packagingBoxId,jdbcType=VARCHAR}, set PACKAGING_BOX_ID = #{packagingBoxId,jdbcType=VARCHAR}
SLOT = #{slot,jdbcType=NUMERIC}
where WO_SUBSTRATE_ID = #{woSubstrateId,jdbcType=VARCHAR} where WO_SUBSTRATE_ID = #{woSubstrateId,jdbcType=VARCHAR}
</update> </update>
<select id="powerReport" resultMap="ResultMapPowerRe">
select
COUNT(twpbs.WO_SUBSTRATE_ID) as sub_num,twpbs.POWER_LEVEL as sub_level,sum(twpbs.PMPP) as sum_pmpp
from t_wo_packaging_box_substrate twpbs
left join t_wo_packaging_box twpb on twpbs.PACKAGING_BOX_ID = twpb.BOX_NO
<where>
twpbs.PACKAGING_BOX_ID != '0'
<if test="queryParam.begin != null and queryParam.end != null">
and twpb.CREATE_TIME between #{queryParam.begin} AND #{queryParam.end}
</if>
<if test="queryParam.orderName != null">
and twpbs.ORDER_NAME = #{queryParam.orderName}
</if>
<if test="queryParam.model != null">
and twpb.model = #{queryParam.model}
</if>
</where>
group by twpbs.POWER_LEVEL
</select>
<select id="orderNameList" resultType="string">
select
twpbs.ORDER_NAME as orderName
from t_wo_packaging_box_substrate twpbs
where
twpbs.PACKAGING_BOX_ID != '0'
and twpbs.ORDER_NAME != ''
group by twpbs.ORDER_NAME
</select>
</mapper> </mapper>

2
ym-packing/src/main/resources/mapper/WoPowerLevelMapper.xml
View File

@ -38,7 +38,7 @@
and twpl.line_body = #{param.lineBody} and twpl.line_body = #{param.lineBody}
</if> </if>
<if test="param.pmpp != null"> <if test="param.pmpp != null">
and twpl.pmpp_high <![CDATA[ > ]]> #{param.pmpp} and twpl.pmpp_low <![CDATA[ <= ]]> #{param.pmpp} and twpl.pmpp_high <![CDATA[ >= ]]> #{param.pmpp} and twpl.pmpp_low <![CDATA[ <= ]]> #{param.pmpp}
</if> </if>
</select> </select>

2
ym-s7/src/main/java/com/cnbm/s7/s7connector/enmuc/S7Client.java
View File

@ -27,7 +27,7 @@ public enum S7Client {
// S7_1200("192.168.0.52",0,1,1,PlcVarActual.HeartBeatFor1200), // S7_1200("192.168.0.52",0,1,1,PlcVarActual.HeartBeatFor1200),
// S7_15001("192.168.0.51",0,1,1), // S7_15001("192.168.0.51",0,1,1),
// S7_1500("192.168.0.51",0,1,1), // S7_1500("192.168.0.51",0,1,1),
S7_KUKA("10.10.3.158",0,1,2), S7_KUKA("10.10.3.158",0,1,1),
//1500 机架-0 插槽-1 //1500 机架-0 插槽-1
//后续 在这里扩展 多PLC应用。 //后续 在这里扩展 多PLC应用。
; ;