扫码接口 品质接口

.idea/FBS_MES.iml

@@ -45,7 +45,6 @@
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.31" level="project" />
     <orderEntry type="library" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.31" level="project" />
     <orderEntry type="library" name="Maven: org.hibernate.validator:hibernate-validator:6.0.10.Final" level="project" />
-    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-web:5.0.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-beans:5.0.7.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-webmvc:5.0.7.RELEASE" level="project" />
@@ -61,7 +60,6 @@
     <orderEntry type="library" scope="TEST" name="Maven: com.jayway.jsonpath:json-path:2.4.0" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.minidev:json-smart:2.3" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: net.minidev:accessors-smart:1.2" level="project" />
-    <orderEntry type="library" scope="TEST" name="Maven: org.ow2.asm:asm:5.0.4" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.assertj:assertj-core:3.9.1" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: org.mockito:mockito-core:2.15.0" level="project" />
@@ -183,5 +181,27 @@
     <orderEntry type="library" name="Maven: org.hibernate.common:hibernate-commons-annotations:4.0.1.Final" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-devtools:2.0.3.RELEASE" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:2.0.3.RELEASE" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-spring-boot-starter-jaxws:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-spring-boot-autoconfigure:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: com.fasterxml.woodstox:woodstox-core:5.0.3" level="project" />
+    <orderEntry type="library" name="Maven: org.codehaus.woodstox:stax2-api:3.1.4" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.ws.xmlschema:xmlschema-core:2.2.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: xml-resolver:xml-resolver:1.2" level="project" />
+    <orderEntry type="library" name="Maven: org.ow2.asm:asm:5.2" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: wsdl4j:wsdl4j:1.6.3" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-databinding-jaxb:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.2.5" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.1.1" level="project" />
+    <orderEntry type="library" name="Maven: javax.validation:validation-api:2.0.1.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.2.4.Final" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20160810" level="project" />
   </component>
 </module>

src/main/java/org/jeecg/modules/appInterface/controller/FbsWorkingStatisticsController.java

@@ -159,7 +159,7 @@ public class FbsWorkingStatisticsController {
 		 //状态（0初始，1接单,2暂停，3完成）
 		 QueryWrapper<FbsWorkshopDispatchList> ypffscSaleorderBQueryWrapper = new QueryWrapper<>();
 		 ypffscSaleorderBQueryWrapper.eq("personnel_id_u8", entity.getPersonnelCode()).eq("del_flag", 0);
-		 ypffscSaleorderBQueryWrapper.eq("production_order_number_id", entity.getOrderNumber());
+		 ypffscSaleorderBQueryWrapper.eq("production_order_number_name", entity.getOrderNumber());
 		 ypffscSaleorderBQueryWrapper.in("state", 0,2);
 		 List<FbsWorkshopDispatchList> list = fbsWorkshopDispatchListService.list(ypffscSaleorderBQueryWrapper);
 		 if(list.size() < 1){
@@ -176,13 +176,16 @@ public class FbsWorkingStatisticsController {
              return new ResponseEntity<ResHttpStatus>(res, HttpStatus.OK);
          }
 		 entity.setStartDate(workshopDispatchList.getPlannedStartTime());//计划时间
-		 entity.setEndDate(workshopDispatchList.getPlannedStartTime());//计划时间
+		 entity.setEndDate(workshopDispatchList.getPlannedEndTime());//计划时间
+		 entity.setMaterielCode(workshopDispatchList.getProductId());//物料编码
+		 entity.setMaterielName(workshopDispatchList.getProduct());//物料名称
 
 		 entity.setFirstTime(new Date());//获取当前时间
 		 entity.setFinalInfo("开工");
 		 entity.setFinalState("1");//完结状态（1-开工，2-下岗/暂停，3-实时报工）
 		 entity.setPkWorkshopDispatchList(list.get(0).getId());
 
+
 		 fbsWorkingStatisticsService.save(entity);
          fbsWorkshopDispatchListService.updateState("1",list.get(0).getId());
 
@@ -260,7 +263,7 @@ public class FbsWorkingStatisticsController {
 		//状态（0初始，1接单,2暂停，3完成）
 		 QueryWrapper<FbsWorkshopDispatchList> ypffscSaleorderBQueryWrapper = new QueryWrapper<>();
 		 ypffscSaleorderBQueryWrapper.eq("personnel_id_u8", entity.getPersonnelCode()).eq("del_flag", 0);
-		 ypffscSaleorderBQueryWrapper.eq("production_order_number_id", entity.getOrderNumber());
+		 ypffscSaleorderBQueryWrapper.eq("production_order_number_name", entity.getOrderNumber());
 		 ypffscSaleorderBQueryWrapper.eq("state", 1);
 
 		 List<FbsWorkshopDispatchList> list = fbsWorkshopDispatchListService.list(ypffscSaleorderBQueryWrapper);
@@ -283,6 +286,7 @@ public class FbsWorkingStatisticsController {
 		 entity.setFinalInfo("下岗/暂停");
 		 entity.setFinalState("2");//完结状态（1-开工，2-下岗/暂停，3-实时报工）
 		 entity.setPkWorkshopDispatchList(list.get(0).getId());
+		 entity.setId(list2.get(0).getId());
 		 fbsWorkingStatisticsService.updateById(entity);
          fbsWorkshopDispatchListService.updateState("2",entity.getPkWorkshopDispatchList());
 

src/main/java/org/jeecg/modules/fbsQualityQualificationRate/entity/FbsQualityQualificationRate.java

@@ -45,6 +45,26 @@ public class FbsQualityQualificationRate implements Serializable {
 	/**第六个月*/
 	@Excel(name = "第六个月", width = 15)
 	private Double sixMonth;
+	/**第七个月*/
+	@Excel(name = "第七个月", width = 15)
+	private Double sevenMonth;
+	/**第八个月*/
+	@Excel(name = "第八个月", width = 15)
+	private Double eightMonth;
+	/**第九个月*/
+	@Excel(name = "第九个月", width = 15)
+	private Double nineMonth;
+	/**第十个月*/
+	@Excel(name = "第十个月", width = 15)
+	private Double tenMonth;
+	/**第十一个月*/
+	@Excel(name = "第十一个月", width = 15)
+	private Double elevenMonth;
+	/**第十二个月*/
+	@Excel(name = "第十二个月", width = 15)
+	private Double twelveMonth;
+
+
 	/**第一个月*/
 	@Excel(name = "月名称1", width = 15)
 	private String oneMonthName;
@@ -63,6 +83,24 @@ public class FbsQualityQualificationRate implements Serializable {
 	/**第六个月*/
 	@Excel(name = "月名称6", width = 15)
 	private String sixMonthName;
+	/**第七个月*/
+	@Excel(name = "月名称7", width = 15)
+	private String sevenMonthName;
+	/**第八个月*/
+	@Excel(name = "月名称8", width = 15)
+	private String eightMonthName;
+	/**第九个月*/
+	@Excel(name = "月名称9", width = 15)
+	private String nineMonthName;
+	/**第十个月*/
+	@Excel(name = "月名称10", width = 15)
+	private String tenMonthName;
+	/**第十一个月*/
+	@Excel(name = "月名称11", width = 15)
+	private String elevenMonthName;
+	/**第十二个月*/
+	@Excel(name = "月名称12", width = 15)
+	private String twelveMonthName;
 	/**备注*/
 	@Excel(name = "备注", width = 15)
 	private String memo;

src/main/java/org/jeecg/modules/fbsQualityQualificationRate/service/impl/FbsQualityQualificationRateServiceImpl.java

@@ -84,6 +84,36 @@ public class FbsQualityQualificationRateServiceImpl extends ServiceImpl<FbsQuali
             map6.put("real",fbsQualityQualificationRate.getSixMonth());
             map6.put("target",fbsQualityQualificationRate.getScaleMark());
             mapList.add(map6);
+            Map<String,Object> map7=new HashMap<>();
+            map7.put("month",fbsQualityQualificationRate.getSevenMonthName());
+            map7.put("real",fbsQualityQualificationRate.getSevenMonth());
+            map7.put("target",fbsQualityQualificationRate.getScaleMark());
+            mapList.add(map7);
+            Map<String,Object> map8=new HashMap<>();
+            map8.put("month",fbsQualityQualificationRate.getEightMonthName());
+            map8.put("real",fbsQualityQualificationRate.getEightMonth());
+            map8.put("target",fbsQualityQualificationRate.getScaleMark());
+            mapList.add(map8);
+            Map<String,Object> map9=new HashMap<>();
+            map9.put("month",fbsQualityQualificationRate.getNineMonthName());
+            map9.put("real",fbsQualityQualificationRate.getNineMonth());
+            map9.put("target",fbsQualityQualificationRate.getScaleMark());
+            mapList.add(map9);
+            Map<String,Object> map10=new HashMap<>();
+            map10.put("month",fbsQualityQualificationRate.getTenMonthName());
+            map10.put("real",fbsQualityQualificationRate.getTenMonth());
+            map10.put("target",fbsQualityQualificationRate.getScaleMark());
+            mapList.add(map10);
+            Map<String,Object> map11=new HashMap<>();
+            map11.put("month",fbsQualityQualificationRate.getElevenMonthName());
+            map11.put("real",fbsQualityQualificationRate.getElevenMonth());
+            map11.put("target",fbsQualityQualificationRate.getScaleMark());
+            mapList.add(map11);
+            Map<String,Object> map12=new HashMap<>();
+            map12.put("month",fbsQualityQualificationRate.getTwelveMonthName());
+            map12.put("real",fbsQualityQualificationRate.getTwelveMonth());
+            map12.put("target",fbsQualityQualificationRate.getScaleMark());
+            mapList.add(map12);
 
         }
         return mapList;