diff --git a/ym-admin/src/main/java/com/cnbm/admin/service/impl/LoginServiceImpl.java b/ym-admin/src/main/java/com/cnbm/admin/service/impl/LoginServiceImpl.java
index 064314a..f9777e3 100644
--- a/ym-admin/src/main/java/com/cnbm/admin/service/impl/LoginServiceImpl.java
+++ b/ym-admin/src/main/java/com/cnbm/admin/service/impl/LoginServiceImpl.java
@@ -56,10 +56,10 @@ public class LoginServiceImpl implements LoginService {
@Override
public Result login(HttpServletRequest request, LoginParam loginParam) {
//验证码是否正确
- boolean flag = captchaService.validate(loginParam.getUuid(), loginParam.getCaptcha());
- if(!flag){
- return new Result<>().error(ErrorCode.CAPTCHA_ERROR, "验证码错误");
- }
+// boolean flag = captchaService.validate(loginParam.getUuid(), loginParam.getCaptcha());
+// if(!flag){
+// return new Result<>().error(ErrorCode.CAPTCHA_ERROR, "验证码错误");
+// }
UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(loginParam.getUsername(),loginParam.getPassword());
Authentication authenticate = authenticationManager.authenticate(authenticationToken);
//登录日志
diff --git a/ym-gateway/src/main/resources/application-dev.yml b/ym-gateway/src/main/resources/application-dev.yml
index 3bbe591..e05b340 100644
--- a/ym-gateway/src/main/resources/application-dev.yml
+++ b/ym-gateway/src/main/resources/application-dev.yml
@@ -1,10 +1,15 @@
spring:
datasource:
- #MySQL
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
- username: root
- password: 1qaz@WSX3edc$RFV
+ #MySQL-local
+# url: jdbc:mysql://10.0.1.249:3306/mt_cigs4?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+# username: cigs4
+# 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
# driver-class-name: oracle.jdbc.OracleDriver
# url: jdbc:oracle:thin:@192.168.10.10:1521:xe
@@ -60,13 +65,14 @@ dynamic:
# 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
- ## camline系统
+ ## camline系统 - remote
camline:
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
username: root
password: 1qaz@WSX3edc$RFV
#
+ #camline系统 - local
# camline:
# 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
diff --git a/ym-gateway/src/main/resources/application.yml b/ym-gateway/src/main/resources/application.yml
index 4bd8c39..5285fa8 100644
--- a/ym-gateway/src/main/resources/application.yml
+++ b/ym-gateway/src/main/resources/application.yml
@@ -33,9 +33,10 @@ spring:
enabled: true
redis:
database: 6
- host: 192.168.0.135
- port: 6380
- password: '@WSXcde3' # 密码（默认为空）
+ #host: 10.0.1.249
+ host: 192.168.0.102
+ port: 6379
+ password: '' # 密码（默认为空）
timeout: 6000ms # 连接超时时长（毫秒）
jedis:
pool:
diff --git a/ym-gateway/src/main/resources/logback.xml b/ym-gateway/src/main/resources/logback.xml
index 5265425..15c84a5 100644
--- a/ym-gateway/src/main/resources/logback.xml
+++ b/ym-gateway/src/main/resources/logback.xml
@@ -16,7 +16,7 @@
-
+
@@ -392,6 +392,12 @@
+
+
+
+
+
+
diff --git a/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java b/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
index b9f45e9..718e1dd 100644
--- a/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
+++ b/ym-packing/src/main/java/com/cnbm/dispatch/KukaJoinThread.java
@@ -8,12 +8,14 @@ import com.cnbm.dispatch.enums.kuka.step2.Step2Plc2MesVar;
import com.cnbm.dispatch.enums.kuka.step3.Step3Mes2PlcVar;
import com.cnbm.dispatch.enums.kuka.step3.Step3Plc2MesVar;
import com.cnbm.packing.dto.CamlineExtendArgDTO;
+import com.cnbm.packing.dto.CamlineSubIdDTO;
import com.cnbm.packing.entity.WoPackagingBox;
import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
import com.cnbm.packing.entity.WoPowerLevel;
import com.cnbm.packing.service.*;
import com.cnbm.s7.s7connector.enmuc.S7Client;
import com.cnbm.s7.s7connector.type.PlcVar;
+import io.swagger.models.auth.In;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +24,8 @@ import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
+import java.text.DecimalFormat;
+import java.text.Format;
import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.Date;
@@ -65,6 +69,7 @@ public class KukaJoinThread implements ApplicationRunner {
+
/**
* return
* 成功： 返回相应的object对象
@@ -149,198 +154,260 @@ public class KukaJoinThread implements ApplicationRunner {
public String getBoxId(String sapMaterial){
Integer todayBoxNum = service.getTodayBoxNum();
String nowTime = DateUtil.format(new Date(), "yyMMdd");
- String res = "301"+sapMaterial+nowTime+todayBoxNum;
+
+ todayBoxNum+=500;
+ String res = "301"+sapMaterial+nowTime+formateString(todayBoxNum);
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
public void run(ApplicationArguments args) throws Exception {
- kukaStep1.scheduleAtFixedRate(new Runnable() {
- @Override
- public void run() {
- //调度开始
-// logger.info("");
-// logger.info("================= 现在开始执行 过程一 任务 ==================");
- Integer subArrived = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, true);
- if(subArrived != 1){
- logger.info("失败"+" --- "+" MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
- }
-
- //一. 从plc 中获取 subId 和 lineNum
- String subId = (String) read(S7Client.S7_KUKA,Step1Plc2MesVar.SubIdToMes);
- Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step1Plc2MesVar.LineNum);
-
-
- //二. MES 业务
- //=============== MES 业务 开始 =================
- //1. 从comline数据库中获取 实际pmpp
- float pmppBySubId = service.getPMPPBySubId(subId);
- //2. 匹配和计算补偿功率
- float actualPMPP = compensationPowerServiceBiz.calculCompensationPMPP(pmppBySubId,lineNum);
- //3. 依据补偿功率，获取工艺参数，并且把这些工艺参数传给kuka
- WoPowerLevel argByPMPP = levelServiceBiz.getArgByPMPP(actualPMPP, lineNum);
- write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Pnom,Integer.valueOf(argByPMPP.getPowerClass()));
- write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Voc,argByPMPP.getLableVoc());
- write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Isc,argByPMPP.getLableIsc());
- write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Vmpp,argByPMPP.getLableVmpp());
- write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,argByPMPP.getLableImpp());
- 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());
-
-
- //4. 把基板录到数据库
- WoPackagingBoxSubstrate woPackagingBoxSubstrate = new WoPackagingBoxSubstrate();
- woPackagingBoxSubstrate.setLineBody(lineNum);
- woPackagingBoxSubstrate.setPowerLevel(argByPMPP.getPowerClass());
- woPackagingBoxSubstrate.setSapMaterial(argByPMPP.getSapMaterialNum());
- woPackagingBoxSubstrate.setWoSubstrateId(subId);
-
- //5. 从camline那里获取可变字段
- CamlineExtendArgDTO extendArgFromCamline = service.getExtendArgFromCamline(subId);
- woPackagingBoxSubstrate.setLastUpdateTime(extendArgFromCamline.getLastUpdateTime());
- woPackagingBoxSubstrate.setPmpp(actualPMPP);
- woPackagingBoxSubstrate.setOrderName(extendArgFromCamline.getOrderName());
- woPackagingBoxSubstrate.setBinclassFl1(extendArgFromCamline.getBinclassFl1());
- woPackagingBoxSubstrate.setBinclassFl2(extendArgFromCamline.getBinclassFl2());
- woPackagingBoxSubstrate.setEtaFl1(extendArgFromCamline.getEtaFl1());
- woPackagingBoxSubstrate.setEtaFl2(extendArgFromCamline.getEtaFl2());
- woPackagingBoxSubstrate.setFfFl1(extendArgFromCamline.getFfFl1());
- woPackagingBoxSubstrate.setFfFl2(extendArgFromCamline.getFfFl2());
- woPackagingBoxSubstrate.setImppFl1(extendArgFromCamline.getImppFl1());
- woPackagingBoxSubstrate.setImppFl2(extendArgFromCamline.getImppFl2());
- woPackagingBoxSubstrate.setInsolflashcontrolFl1(extendArgFromCamline.getInsolflashcontrolFl1());
- woPackagingBoxSubstrate.setInsolflashcontrolFl2(extendArgFromCamline.getInsolflashcontrolFl2());
- woPackagingBoxSubstrate.setInsolmppFl1(extendArgFromCamline.getInsolmppFl1());
- woPackagingBoxSubstrate.setInsolmppFl2(extendArgFromCamline.getInsolmppFl2());
- woPackagingBoxSubstrate.setInsolvocFl1(extendArgFromCamline.getInsolvocFl1());
- woPackagingBoxSubstrate.setInsolvocFl2(extendArgFromCamline.getInsolvocFl2());
- woPackagingBoxSubstrate.setInsolFl1(extendArgFromCamline.getInsolFl1());
- woPackagingBoxSubstrate.setInsolFl2(extendArgFromCamline.getInsolFl2());
- woPackagingBoxSubstrate.setIscFl1(extendArgFromCamline.getIscFl1());
- woPackagingBoxSubstrate.setIscFl2(extendArgFromCamline.getIscFl2());
- woPackagingBoxSubstrate.setMeasTimeFl1(extendArgFromCamline.getMeasTimeFl1());
- woPackagingBoxSubstrate.setMeasTimeFl2(extendArgFromCamline.getMeasTimeFl2());
- woPackagingBoxSubstrate.setPmppFl1(extendArgFromCamline.getPmppFl1());
- woPackagingBoxSubstrate.setPmppFl2(extendArgFromCamline.getPmppFl2());
- woPackagingBoxSubstrate.setTcellFl1(extendArgFromCamline.getTcellFl1());
- woPackagingBoxSubstrate.setTcellFl2(extendArgFromCamline.getTcellFl2());
- woPackagingBoxSubstrate.setTmonicellFl1(extendArgFromCamline.getTmonicellFl1());
- woPackagingBoxSubstrate.setTmonicellFl2(extendArgFromCamline.getTmonicellFl2());
- woPackagingBoxSubstrate.setUmppFl1(extendArgFromCamline.getUmppFl1());
- woPackagingBoxSubstrate.setUmppFl2(extendArgFromCamline.getUmppFl2());
- woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl1());
- woPackagingBoxSubstrate.setUocFl1(extendArgFromCamline.getUocFl2());
-
- substrateServiceBiz.insert(woPackagingBoxSubstrate);
- //=============== MES 业务 结束 =================
-
- //三. 当MES完成任务后，把MesToPlc.SubArrivedFinish变量置为true，告诉plc，我操作完成了
- write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true);
-
- //四. mes 监控 到PlcToMes.SubArrived==false，就把MesToPlc.SubArrivedFinish置为false
- Integer subArrived2 = waitingForTarget(Step1Plc2MesVar.SubArrivedToMes, false);
- if(subArrived2 != 1){
- logger.info("失败"+" --- "+"MES监听 Step1Plc2MesVar.SubArrivedToMes 是否 等于 1 失败");
- }
- write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,false);
- }
- },1,1, TimeUnit.SECONDS);
-
-
- kukaStep2.scheduleAtFixedRate(new Runnable() {
- @Override
- public void run() {
- //调度开始
-
- Integer shelfIsFull = waitingForTarget(Step2Plc2MesVar.ShelfIsFull, true);
- if(shelfIsFull != 1){
- logger.info("失败"+" --- "+"MES监听 Step2Plc2MesVar.ShelfIsFull 是否 等于 1 失败");
- }
-
- //一. 从plc 中获取 subIdList 和 lineNum
- String[] subIdList = (String[])read(S7Client.S7_KUKA,Step2Plc2MesVar.SubIdList);
-// Integer lineNum = (Integer) read(S7Client.S7_KUKA,Step2Plc2MesVar.LineNum);
- logger.info("获取到基板列表："+ Arrays.toString(subIdList));
-
- //二. MES 业务
- //=============== MES 业务 开始 =================
- //1.MES 生成BoxId
- if(subIdList.length<=0){
- logger.info("失败"+" --- "+"从plc里面获取到的基板列表 为空");
- }
- WoPackagingBoxSubstrate bySubId = substrateServiceBiz.getBySubId(subIdList[0]);
- String boxId = getBoxId(bySubId.getSapMaterial());
- logger.info("mes 生成的boxId :"+ boxId);
- //2. 依次update 基板表，把boxId 赋予这些基板
- for(int i=0;i 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")
public R testReadAll() throws UnsupportedEncodingException, ParseException {
@@ -139,17 +180,32 @@ public class TestController {
BigDecimal vmpp = new BigDecimal(46.799);
BigDecimal impp = new BigDecimal(3.0799);
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);
+ System.out.println(Step1Mes2PlcVar.dLable_Voc.getName()+" : "+voc.toPlainString());
+
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);
+ System.out.println(Step1Mes2PlcVar.dLable_Vmpp.getName()+" : "+vmpp.toPlainString());
+
write(S7Client.S7_KUKA,Step1Mes2PlcVar.dLable_Impp,impp);
+ System.out.println(Step1Mes2PlcVar.dLable_Impp.getName()+" : "+impp.toPlainString());
write(S7Client.S7_KUKA,Step2Mes2PlcVar.BoxId,"12345678901111111111");
+ System.out.println(Step2Mes2PlcVar.BoxId.getName()+" : "+"12345678901111111111");
+
write(S7Client.S7_KUKA,Step1Mes2PlcVar.SubArrivedFinish,true);
+ System.out.println(Step1Mes2PlcVar.SubArrivedFinish.getName()+" : "+"true");
+
write(S7Client.S7_KUKA,Step2Mes2PlcVar.ShelfIsFullFinish,false);
+ System.out.println(Step2Mes2PlcVar.ShelfIsFullFinish.getName()+" : "+"false");
write(S7Client.S7_KUKA,Step3Mes2PlcVar.ShelfIsFullArrivedFinish,true);
+ System.out.println(Step3Mes2PlcVar.ShelfIsFullArrivedFinish.getName()+" : "+"true");
return R.ok();
@@ -158,10 +214,28 @@ public class TestController {
public R testlogger() {
logger.info("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();
}
+
@PostMapping("getPMPPBySubId")
@ApiImplicitParams({
@ApiImplicitParam(name = "subId", value = "基板ID", paramType = "query", required = true, dataTypeClass=Integer.class) ,
diff --git a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java
index 19364e4..50be926 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/controller/WoPackagingBoxSubstrateController.java
@@ -13,24 +13,30 @@ import com.cnbm.common.validator.group.AddGroup;
import com.cnbm.common.validator.group.DefaultGroup;
import com.cnbm.common.validator.group.UpdateGroup;
import com.cnbm.packing.dto.ChangePackingBoxDTO;
+import com.cnbm.packing.dto.PowerReportDTO;
import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO;
import com.cnbm.packing.entity.WoPackagingBox;
import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
import com.cnbm.packing.excel.WoPackagingBoxSubstrateExcel;
import com.cnbm.packing.mapper.WoPackagingBoxMapper;
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.vo.PowerReportVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
+import org.omg.CORBA.PRIVATE_MEMBER;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
import springfox.documentation.annotations.ApiIgnore;
import javax.servlet.http.HttpServletResponse;
+import java.text.DecimalFormat;
import java.util.List;
import java.util.Map;
@@ -48,6 +54,9 @@ public class WoPackagingBoxSubstrateController {
@Autowired
private WoPackagingBoxSubstrateServiceBiz woPackagingBoxSubstrateService;
+ @Autowired
+ private WoPackagingBoxServiceBiz boxServiceBiz;
+
@Autowired
private WoPackagingBoxSubstrateMapper woPackagingBoxSubstrateMapper;
@@ -93,6 +102,16 @@ public class WoPackagingBoxSubstrateController {
return new Result().ok(dto.getId());
}
+// @PostMapping
+// @ApiOperation("功率报表")
+// @LogOperation("功率报表查询")
+// public Result> powerReport(@RequestBody PowerReportQueryParam queryParam){
+//
+//
+// List powerReportDTOS = boxServiceBiz.powerReport(queryParam.getOrderName(), queryParam.getBegin(), queryParam.getEnd());
+// return new Result>().ok(powerReportDTOS);
+// }
+
@PutMapping
@ApiOperation("修改")
@LogOperation("修改")
@@ -106,6 +125,48 @@ public class WoPackagingBoxSubstrateController {
return new Result().ok(dto.getId());
}
+ @ApiOperation("查询模组档位统计分布图")
+ @LogOperation("查询模组档位统计分布图")
+ @PostMapping("/powerReport")
+ public Result powerReport(@RequestBody PowerReportQueryParam queryParam){
+ List 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().ok(powerReportVo);
+ }
+
+ @ApiOperation("查询模组档位统计分布图-获取ordername列表")
+ @LogOperation("查询模组档位统计分布图-获取ordername列表")
+ @PostMapping("/orderNameList")
+ public Result> orderNameList(){
+ List powerReportDTOS = boxServiceBiz.orderNameList();
+ return new Result>().ok(powerReportDTOS);
+ }
+
@DeleteMapping
@ApiOperation("删除")
@LogOperation("删除")
diff --git a/ym-packing/src/main/java/com/cnbm/packing/dto/CamlineSubIdDTO.java b/ym-packing/src/main/java/com/cnbm/packing/dto/CamlineSubIdDTO.java
new file mode 100644
index 0000000..40aaa29
--- /dev/null
+++ b/ym-packing/src/main/java/com/cnbm/packing/dto/CamlineSubIdDTO.java
@@ -0,0 +1,30 @@
+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;
+
+
+
+}
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/dto/CamlineSubIdForImportDTO.java b/ym-packing/src/main/java/com/cnbm/packing/dto/CamlineSubIdForImportDTO.java
new file mode 100644
index 0000000..b85b4af
--- /dev/null
+++ b/ym-packing/src/main/java/com/cnbm/packing/dto/CamlineSubIdForImportDTO.java
@@ -0,0 +1,28 @@
+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;
+
+}
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/dto/PowerReportDTO.java b/ym-packing/src/main/java/com/cnbm/packing/dto/PowerReportDTO.java
new file mode 100644
index 0000000..6839b4f
--- /dev/null
+++ b/ym-packing/src/main/java/com/cnbm/packing/dto/PowerReportDTO.java
@@ -0,0 +1,34 @@
+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;
+
+}
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/mapper/CamlineMapper.java b/ym-packing/src/main/java/com/cnbm/packing/mapper/CamlineMapper.java
index c803425..5daa7dd 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/mapper/CamlineMapper.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/mapper/CamlineMapper.java
@@ -1,6 +1,8 @@
package com.cnbm.packing.mapper;
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.Param;
@@ -26,4 +28,8 @@ public interface CamlineMapper {
CamlineExtendArgDTO getExtendArgFromCamline(@Param("subId") String subId);
Integer getTodayBoxNum();
+
+ CamlineSubIdDTO getSubIdByCamline(@Param("subId") String subId);
+
+ List getSubIdByCamlineForImpoet();
}
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/mapper/WoPackagingBoxSubstrateMapper.java b/ym-packing/src/main/java/com/cnbm/packing/mapper/WoPackagingBoxSubstrateMapper.java
index 0403873..7e73412 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/mapper/WoPackagingBoxSubstrateMapper.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/mapper/WoPackagingBoxSubstrateMapper.java
@@ -1,10 +1,15 @@
package com.cnbm.packing.mapper;
+import com.cnbm.packing.dto.PowerReportDTO;
+import com.cnbm.packing.param.PowerReportQueryParam;
import org.apache.ibatis.annotations.Param;
import com.cnbm.common.dao.BaseDao;
import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
import org.apache.ibatis.annotations.Mapper;
+import java.time.LocalDateTime;
+import java.util.List;
+
/**
* 包装箱基板关联表
*
@@ -15,5 +20,9 @@ import org.apache.ibatis.annotations.Mapper;
public interface WoPackagingBoxSubstrateMapper extends BaseDao {
WoPackagingBoxSubstrate getOneByWoSubstrateId(@Param("woSubstrateId") String woSubstrateId);
- int updatePackagingBoxIdByWoSubstrateId(@Param("packagingBoxId") String packagingBoxId, @Param("woSubstrateId") String woSubstrateId);
-}
\ No newline at end of file
+
+ int updatePackagingBoxIdAndSlotByWoSubstrateId(@Param("packagingBoxId") String packagingBoxId, @Param("slot") Integer slot, @Param("woSubstrateId") String woSubstrateId);
+
+ List powerReport(@Param("queryParam") PowerReportQueryParam queryParam);
+ List orderNameList();
+}
diff --git a/ym-packing/src/main/java/com/cnbm/packing/param/PowerReportQueryParam.java b/ym-packing/src/main/java/com/cnbm/packing/param/PowerReportQueryParam.java
new file mode 100644
index 0000000..c103777
--- /dev/null
+++ b/ym-packing/src/main/java/com/cnbm/packing/param/PowerReportQueryParam.java
@@ -0,0 +1,20 @@
+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;
+
+}
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/DynamicDataSourceService.java b/ym-packing/src/main/java/com/cnbm/packing/service/DynamicDataSourceService.java
index 5af32ad..2117e3a 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/DynamicDataSourceService.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/DynamicDataSourceService.java
@@ -2,6 +2,8 @@ package com.cnbm.packing.service;
import com.cnbm.dynamic.datasource.annotation.DataSource;
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.mapper.CamlineMapper;
@@ -41,10 +43,22 @@ public class DynamicDataSourceService {
return mapper.getOrderNameBySubId(subId);
}
+ @DataSource("camline")
+ @Transactional
+ public CamlineSubIdDTO getSubIdByCamline(String subId){
+ return mapper.getSubIdByCamline(subId);
+ }
+
@DataSource("camline")
@Transactional
public CamlineExtendArgDTO getExtendArgFromCamline(String subId){
return mapper.getExtendArgFromCamline(subId);
}
+ @DataSource("camline")
+ @Transactional
+ public List getAlllCamlineSubForImp(){
+ return mapper.getSubIdByCamlineForImpoet();
+ }
+
}
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java
index 0d24bdf..09c46d7 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java
@@ -3,10 +3,14 @@ package com.cnbm.packing.service;
import com.cnbm.common.page.PageData;
import com.cnbm.common.service.CrudService;
import com.cnbm.packing.dto.IdVo;
+import com.cnbm.packing.dto.PowerReportDTO;
import com.cnbm.packing.dto.WoPackagingBoxDTO;
import com.cnbm.packing.entity.WoPackagingBox;
import com.cnbm.packing.entity.WoPackagingBoxSubstrate;
+import com.cnbm.packing.param.PowerReportQueryParam;
+import org.apache.ibatis.annotations.Param;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -36,4 +40,7 @@ public interface WoPackagingBoxServiceBiz extends CrudService powerReport(PowerReportQueryParam queryParam);
+ List orderNameList();
}
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java
index 8668a9f..bea2ab2 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java
@@ -35,5 +35,7 @@ public interface WoPackagingBoxSubstrateServiceBiz extends CrudService getWrapper(Map params){
@@ -142,4 +145,14 @@ public class WoPackagingBoxServiceBizImpl extends CrudServiceImpl powerReport(PowerReportQueryParam queryParam) {
+ return substrateMapper.powerReport(queryParam);
+ }
+
+ @Override
+ public List orderNameList() {
+ return substrateMapper.orderNameList();
+ }
}
\ No newline at end of file
diff --git a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
index c753d62..20330e9 100644
--- a/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
+++ b/ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxSubstrateServiceBizImpl.java
@@ -190,7 +190,7 @@ public class WoPackagingBoxSubstrateServiceBizImpl extends CrudServiceImpl powerReports;
+
+
+}
diff --git a/ym-packing/src/main/resources/mapper/CamlineMapper.xml b/ym-packing/src/main/resources/mapper/CamlineMapper.xml
index f855678..73ab205 100644
--- a/ym-packing/src/main/resources/mapper/CamlineMapper.xml
+++ b/ym-packing/src/main/resources/mapper/CamlineMapper.xml
@@ -7,6 +7,17 @@
+
+
+
+
+
+
+
+
+
+
+
@@ -53,16 +64,15 @@
@@ -118,6 +128,101 @@
LIMIT 1
+
+
+
+
+
diff --git a/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml b/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml
index d84f1e0..0f16436 100644
--- a/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml
+++ b/ym-packing/src/main/resources/mapper/WoPackagingBoxSubstrateMapper.xml
@@ -53,6 +53,13 @@
+
+
+
+
+
+
+
-
+
+
+
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}
+
+
+
+
diff --git a/ym-packing/src/main/resources/mapper/WoPowerLevelMapper.xml b/ym-packing/src/main/resources/mapper/WoPowerLevelMapper.xml
index 15beb02..6974982 100644
--- a/ym-packing/src/main/resources/mapper/WoPowerLevelMapper.xml
+++ b/ym-packing/src/main/resources/mapper/WoPowerLevelMapper.xml
@@ -38,7 +38,7 @@
and twpl.line_body = #{param.lineBody}
- and twpl.pmpp_high = ]]> #{param.pmpp} and twpl.pmpp_low #{param.pmpp}
+ and twpl.pmpp_high ]]> #{param.pmpp} and twpl.pmpp_low #{param.pmpp}
diff --git a/ym-s7/src/main/java/com/cnbm/s7/s7connector/enmuc/S7Client.java b/ym-s7/src/main/java/com/cnbm/s7/s7connector/enmuc/S7Client.java
index 6c32fd8..468a855 100644
--- a/ym-s7/src/main/java/com/cnbm/s7/s7connector/enmuc/S7Client.java
+++ b/ym-s7/src/main/java/com/cnbm/s7/s7connector/enmuc/S7Client.java
@@ -27,7 +27,7 @@ public enum S7Client {
// S7_1200("192.168.0.52",0,1,1,PlcVarActual.HeartBeatFor1200),
// S7_15001("192.168.0.51",0,1,1),
// S7_1500("192.168.0.51",0,1,1),
- S7_KUKA("10.10.3.158",0,1,1),
+ S7_KUKA("10.10.3.158",0,1,2),
//1500 机架-0 插槽-1
//后续 在这里扩展 多PLC应用。
;