Yangwl
/
mesnac_mes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改首检、修改物流生成、修改检验任务生成逻辑

Browse Source
master
Yangwl 2 years ago
parent bd3453a776
commit e66081c54b
19 changed files with 606 additions and 63 deletions
Show Stats Download Patch File Download Diff File

2
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/WxOrderServiceImpl.java
Unescape Escape View File

@ -78,6 +78,8 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
return R.failed("导入数据失败：0条数据");
}
if (this.saveBatch(wxOrderList)){
return R.ok("导入数据成功");
}else {

10
common/src/main/java/com/foreverwin/mesnac/common/model/PrintLog.java
Unescape Escape View File

@ -134,6 +134,16 @@ public class PrintLog extends Model<PrintLog> {
@TableField(exist = false)
private Date startToDate;
private String shopOrder;
public String getShopOrder() {
return shopOrder;
}
public void setShopOrder(String shopOrder) {
this.shopOrder = shopOrder;
}
public String getStartFromDate_S() {
return startFromDate_S;
}

1
common/src/main/java/com/foreverwin/mesnac/common/service/InspectionItemService.java
Unescape Escape View File

@ -40,4 +40,5 @@ public interface InspectionItemService extends IService<InspectionItem> {
List<InspectionItemDetail> selectQualityInspection(String sfc, String operation, String stepId, String inspectionType);
void insert(JSONObject jsonObject);
}

2
common/src/main/java/com/foreverwin/mesnac/common/service/InspectionTaskService.java
Unescape Escape View File

@ -32,7 +32,7 @@ public interface InspectionTaskService extends IService<InspectionTask> {
void saveTask(Map<String, Object> paramMap);
Map<String, Object> createTask(Map<String, Object> paramMap);
Map<String, Object> createFirstTask(Map<String, Object> paramMap);
InspectionTask isCreateTask(String site, String category, String sfc, String operation, String stepId);
void createNewTask(Map<String, Object> paramMap);

7
common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionItemServiceImpl.java
Unescape Escape View File

@ -13,9 +13,11 @@ import com.foreverwin.mesnac.common.mapper.InspectionItemMapper;
import com.foreverwin.mesnac.common.model.InspectionItem;
import com.foreverwin.mesnac.common.model.InspectionItemAddition;
import com.foreverwin.mesnac.common.model.InspectionItemDetail;
import com.foreverwin.mesnac.common.model.InspectionTask;
import com.foreverwin.mesnac.common.service.InspectionItemAdditionService;
import com.foreverwin.mesnac.common.service.InspectionItemDetailService;
import com.foreverwin.mesnac.common.service.InspectionItemService;
import com.foreverwin.mesnac.common.service.InspectionTaskService;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.meapi.model.Item;
import com.foreverwin.mesnac.meapi.model.Operation;
@ -60,6 +62,8 @@ public class InspectionItemServiceImpl extends ServiceImpl<InspectionItemMapper,
private InspectionItemDetailService inspectionItemDetailService;
@Autowired
private InspectionItemAdditionService inspectionItemAdditionService;
@Autowired
private InspectionTaskService inspectionTaskService;
@Override
public IPage<InspectionItem> selectPage(FrontPage<InspectionItem> frontPage, InspectionItem inspectionItem) {
@ -253,6 +257,7 @@ public class InspectionItemServiceImpl extends ServiceImpl<InspectionItemMapper,
return inspectionItemDetails;
}
@Override
public void insert(JSONObject jsonObject) {
String user = CommonMethods.getUser();
@ -454,6 +459,4 @@ public class InspectionItemServiceImpl extends ServiceImpl<InspectionItemMapper,
inspectionItemDetail.setModifiedDateTime(now);
inspectionItemDetailService.save(inspectionItemDetail);
}
}

63
common/src/main/java/com/foreverwin/mesnac/common/service/impl/InspectionTaskServiceImpl.java
Unescape Escape View File

@ -21,6 +21,7 @@ import com.foreverwin.mesnac.meapi.service.SfcService;
import com.foreverwin.modular.core.exception.BaseException;
import com.foreverwin.modular.core.util.CommonMethods;
import com.foreverwin.modular.core.util.FrontPage;
import com.sap.me.frame.Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -246,6 +247,68 @@ public class InspectionTaskServiceImpl extends ServiceImpl<InspectionTaskMapper,
map.put("inspectItemNo",StringUtil.trimHandle(inspectionItemBo));
return map;
}
@Override
public Map<String, Object> createFirstTask(Map<String, Object> paramMap) {
Map<String,Object>map=new HashMap<>();
//站点
String site = CommonMethods.getSite();
//类型(自检|Z;互检|H;FQC|F;尾检|W)
String category = (String) paramMap.get("CATEGORY");
//产品批次
String sfc = (String) paramMap.get("SFC");
Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(site, sfc));
String shopOrder = StringUtil.trimHandle(sfcServiceById.getShopOrderBo());
//工序
String operation = (String) paramMap.get("OPERATION");
//工序标识
String stepId = (String) paramMap.get("STEP_ID");
//首检 校验是否在当前工序+工序标识 做过检验任务
InspectionTask createTask = isCreateTask(site, category, sfc, operation, stepId);
if (createTask!=null && createTask.getStatus().equals(Constants.INSPECTION_TASK_STATUS_NEW)) {
throw new BaseException("当前产品批次[" + sfc + "]已提交首检任务");
}
if (category.equals(Constants.INSPECTION_TYPE_S)){
String timeString = DateUtil.getTimeString();
String taskNo = "";
String itemNumber = (String) paramMap.get("ITEM_NUMBER");
String description = "";
if (StringUtil.isBlank(itemNumber)) {
taskNo = "S_" + timeString;
} else {
taskNo = "S_" + itemNumber + "_" + timeString;
}
description = "首件检验任务";
String handle = "InspectionBO:" + site + "," + taskNo;
InspectionTask task = new InspectionTask();
task.setHandle(handle);
task.setSite(site);
task.setCategory(category);
task.setTaskNo(taskNo);
task.setStatus(Constants.INSPECTION_TASK_STATUS_NEW);
task.setDescription(description);
task.setShopOrder(shopOrder);
task.setWorkCenter((String) paramMap.get("WORK_CENTER"));
task.setSfc(sfc);
task.setOperation(operation);
task.setStepId(stepId);
task.setResrce((String) paramMap.get("RESRCE"));
task.setCreateUser(CommonMethods.getUser());
task.setCreatedDateTime(LocalDateTime.now());
task.setModifyUser(CommonMethods.getUser());
task.setModifiedDateTime(LocalDateTime.now());
task.setSfcDispatchBo((String) paramMap.get("SFC_DISPATCH_DETAIL_BO"));
task.setSfc(sfc);
save(task);
map.put("taskHandle",handle);
}
return map;
}
@Override
public InspectionTask isCreateTask(String site,String category,String sfc,String operation ,String stepId) {
//自检/互检 校验是否在当前工序+工序标识 做过检验任务

8
common/src/main/resources/mapper/PrintLogMapper.xml
Unescape Escape View File

@ -11,6 +11,7 @@
<result column="PRINT_TEMPLATE" property="printTemplate" />
<result column="PRINT_PARAM" property="printParam" />
<result column="SFC" property="sfc" />
<result column="SHOP_ORDER" property="shopOrder" />
<result column="RESRCE" property="resrce" />
<result column="STEP_ID" property="stepId" />
<result column="OPERATION" property="operation" />
@ -539,9 +540,11 @@
<!--自定义sql-->
<select id="getPrintLogListByCondition" resultMap="BaseResultMap">
SELECT PL.*, I.ITEM ,IT.DESCRIPTION ITEM_DESCRIPTION FROM Z_PRINT_LOG PL
SELECT PL.*, I.ITEM ,IT.DESCRIPTION ITEM_DESCRIPTION,SO.SHOP_ORDER FROM Z_PRINT_LOG PL
LEFT JOIN ITEM I ON I.HANDLE = PL.ITEM_BO
LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE
LEFT JOIN SHOP_ORDER_SFC SOF ON SOF.SFC_BO = 'SFCBO:1000,'||PL.SFC
LEFT JOIN SHOP_ORDER SO ON SOF.SHOP_ORDER_BO=SO.HANDLE
WHERE PL.SITE = #{site}
<if test="startFromDate != null">
AND PL.CREATED_DATE_TIME >= #{startFromDate}
@ -564,6 +567,9 @@
<if test="item != null and item != ''">
AND I.ITEM = #{item}
</if>
<if test="shopOrder != null and shopOrder != ''">
AND SO.SHOP_ORDER = #{shopOrder}
</if>
ORDER BY PL.CREATED_DATE_TIME DESC
</select>

3
common/src/main/resources/mapper/ReportDataMapper.xml
Unescape Escape View File

@ -696,6 +696,9 @@
<if test="abnormalNo != null and abnormalNo != ''" >
AND zab.ABNORMAL_NO = #{abnormalNo}
</if>
<if test="trueInspectUser != null and trueInspectUser != ''" >
AND ZNU.FULL_NAME like '%'||#{trueInspectUser}||'%'
</if>
GROUP BY ZABD.PRINCIPAL_USER,zsd.DISPATCH_QTY,ZABD.DUTY_DEPART,zit."RESULT",zit.sfc ,zit.OPERATION,zit.STEP_ID,CFA.VALUE,CFB.VALUE, zit.CREATED_DATE_TIME,zit.RESRCE,zab.NC_QTY,zit.CREATED_DATE_TIME, ZNU.FULL_NAME,WT.DESCRIPTION,I.ITEM,IT.DESCRIPTION,O.OPERATION,OT.DESCRIPTION,ZSD.EMPLOYEE,ZSD.EMPLOYEE_DESCRIPTION,zit.COMMENTS,zit.CATEGORY,SO.SHOP_ORDER,zab.ABNORMAL_NO
)
WHERE SEQ='1'

266
console/console.iml
Unescape Escape View File

@ -0,0 +1,266 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="web" name="Web">
<configuration>
<descriptors>
<deploymentDescriptor name="web.xml" url="file://$MODULE_DIR$/src/main/webapp/WEB-INF/web.xml" />
</descriptors>
<webroots>
<root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
</webroots>
<sourceRoots>
<root url="file://$MODULE_DIR$/src/main/java" />
<root url="file://$MODULE_DIR$/src/main/resources" />
</sourceRoots>
</configuration>
</facet>
<facet type="Spring" name="Spring">
<configuration />
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="common" />
<orderEntry type="library" name="Maven: org.apache.poi:poi:3.8" level="project" />
<orderEntry type="library" name="Maven: commons-codec:commons-codec:1.10" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.8" level="project" />
<orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
<orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
<orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
<orderEntry type="library" name="Maven: xml-apis:xml-apis:1.4.01" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-activemq:2.1.3.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter:1.5.22.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot:1.5.22.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-autoconfigure:1.5.22.RELEASE" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.yaml:snakeyaml:1.17" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jms:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-messaging:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.activemq:activemq-broker:5.14.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.activemq:activemq-openwire-legacy:5.14.5" level="project" />
<orderEntry type="library" name="Maven: javax.jms:javax.jms-api:2.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.activemq:activemq-pool:5.13.4" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.26" level="project" />
<orderEntry type="library" name="Maven: org.apache.activemq:activemq-jms-pool:5.14.5" level="project" />
<orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jms_1.1_spec:1.1.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.activemq:activemq-client:5.14.5" level="project" />
<orderEntry type="library" name="Maven: org.fusesource.hawtbuf:hawtbuf:1.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-j2ee-management_1.1_spec:1.0.1" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.4.3" level="project" />
<orderEntry type="library" name="Maven: commons-lang:commons-lang:2.4" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:guava:28.0-jre" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:3.0.2" level="project" />
<orderEntry type="library" name="Maven: org.checkerframework:checker-qual:2.8.1" level="project" />
<orderEntry type="library" name="Maven: com.google.errorprone:error_prone_annotations:2.3.2" level="project" />
<orderEntry type="library" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.mojo:animal-sniffer-annotations:1.17" level="project" />
<orderEntry type="library" name="Maven: javax.mail:mail:1.4.7" level="project" />
<orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
<orderEntry type="library" name="Maven: cn.hutool:hutool-all:5.0.6" level="project" />
<orderEntry type="library" name="Maven: org.jsoup:jsoup:1.11.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.axis:axis:1.4" level="project" />
<orderEntry type="library" name="Maven: commons-discovery:commons-discovery:0.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.axis:axis-saaj:1.4" level="project" />
<orderEntry type="library" name="Maven: commons-net:commons-net:3.1" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:itextpdf:5.5.13" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:barcodes:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:font-asian:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:forms:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:hyph:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:io:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:commons:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:kernel:7.2.0" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcpkix-jdk15on:1.68" level="project" />
<orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15on:1.68" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:layout:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:pdfa:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:sign:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:styled-xml-parser:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:svg:7.2.0" level="project" />
<orderEntry type="library" name="Maven: com.itextpdf:itext-asian:5.2.0" level="project" />
<orderEntry type="library" name="Maven: com.google.zxing:core:3.1.0" level="project" />
<orderEntry type="library" name="Maven: com.google.zxing:javase:3.1.0" level="project" />
<orderEntry type="library" name="Maven: com.jcraft:jsch:0.1.55" level="project" />
<orderEntry type="module" module-name="equip" />
<orderEntry type="module" module-name="meapi" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-core:2.7" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-api:2.7" level="project" />
<orderEntry type="module" module-name="dataimport" />
<orderEntry type="library" name="Maven: net.sourceforge.javacsv:javacsv:2.0" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.7" level="project" />
<orderEntry type="module" module-name="dispatch" />
<orderEntry type="module" module-name="quality" />
<orderEntry type="library" name="Maven: mysql:mysql-connector-java:5.1.48" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.9" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.11" level="project" />
<orderEntry type="module" module-name="production" />
<orderEntry type="library" name="Maven: org.freemarker:freemarker:2.3.30" level="project" />
<orderEntry type="library" name="Maven: org.projectlombok:lombok:1.16.22" level="project" />
<orderEntry type="module" module-name="anomaly" />
<orderEntry type="library" name="Maven: org.springframework:spring-web:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-aop:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-beans:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-expression:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-core:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-quartz:2.0.5.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-context-support:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-tx:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.quartz-scheduler:quartz:2.3.0" level="project" />
<orderEntry type="library" name="Maven: com.mchange:mchange-commons-java:0.2.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.9" level="project" />
<orderEntry type="module" module-name="listener" />
<orderEntry type="module" module-name="quartz" />
<orderEntry type="module" module-name="integration" />
<orderEntry type="library" name="Maven: com.foreverwin.modular:modular-core:1.0-SNAPSHOT.standlone-hana" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-web:1.5.22.RELEASE" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.springframework.boot:spring-boot-starter-tomcat:1.5.22.RELEASE" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-core:8.5.43" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat:tomcat-annotations-api:8.5.43" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-el:8.5.43" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.tomcat.embed:tomcat-embed-websocket:8.5.43" level="project" />
<orderEntry type="library" name="Maven: org.hibernate:hibernate-validator:5.3.6.Final" level="project" />
<orderEntry type="library" name="Maven: javax.validation:validation-api:1.1.0.Final" level="project" />
<orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.3.2.Final" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml:classmate:1.3.4" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.11.3" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-webmvc:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-log4j2:1.5.22.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.7" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.26" level="project" />
<orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.26" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-test:1.5.22.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test:1.5.22.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-test-autoconfigure:1.5.22.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.jayway.jsonpath:json-path:2.2.0" level="project" />
<orderEntry type="library" name="Maven: net.minidev:json-smart:2.2.1" level="project" />
<orderEntry type="library" name="Maven: net.minidev:accessors-smart:1.1" level="project" />
<orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
<orderEntry type="library" name="Maven: org.assertj:assertj-core:2.6.0" level="project" />
<orderEntry type="library" name="Maven: org.mockito:mockito-core:1.10.19" level="project" />
<orderEntry type="library" scope="RUNTIME" name="Maven: org.objenesis:objenesis:2.1" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
<orderEntry type="library" name="Maven: org.hamcrest:hamcrest-library:1.3" level="project" />
<orderEntry type="library" name="Maven: org.skyscreamer:jsonassert:1.4.0" level="project" />
<orderEntry type="library" name="Maven: com.vaadin.external.google:android-json:0.0.20131108.vaadin1" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-test:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:dynamic-datasource-spring-boot-starter:2.5.6" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-jdbc:1.5.1.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework:spring-jdbc:4.3.25.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:1.5.22.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.8.14" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis:3.4.2" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.1.0" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.1.0" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.1.0" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-core:3.1.0" level="project" />
<orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-annotation:3.1.0" level="project" />
<orderEntry type="library" name="Maven: com.github.jsqlparser:jsqlparser:1.4" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-spring:2.0.0" level="project" />
<orderEntry type="library" name="Maven: com.zaxxer:HikariCP:2.5.1" level="project" />
<orderEntry type="library" name="Maven: ojdbc6:ojdbc6:11.2.0.4" level="project" />
<orderEntry type="library" name="Maven: com.sap:ngdbc:2.5.52" level="project" />
<orderEntry type="library" name="Maven: com.sap:sapdbc:7.9.09" level="project" />
<orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-legacy:1.1.0.RELEASE" level="project" />
<orderEntry type="library" name="Maven: org.mybatis:mybatis-typehandlers-jsr310:1.0.2" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.11" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" level="project" />
<orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-jaxws:3.1.12" 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.0.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-core:3.1.12" level="project" />
<orderEntry type="library" name="Maven: org.codehaus.woodstox:woodstox-core-asl:4.4.1" 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.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-soap:3.1.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-wsdl:3.1.12" 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.1.12" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.11" level="project" />
<orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-core:2.2.11" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-bindings-xml:3.1.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-frontend-simple:3.1.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-addr:3.1.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-ws-policy:3.1.12" level="project" />
<orderEntry type="library" name="Maven: org.apache.neethi:neethi:3.0.3" level="project" />
<orderEntry type="library" name="Maven: org.apache.cxf:cxf-rt-transports-http:3.1.12" level="project" />
<orderEntry type="library" name="Maven: com.sap:sapjco:NTAMD64-3.0.6" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-continuation:9.4.19.v20190610" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-http:9.4.19.v20190610" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-io:9.4.19.v20190610" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-server:9.4.19.v20190610" level="project" />
<orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-util:9.4.19.v20190610" level="project" />
<orderEntry type="library" name="Maven: org.eclipse.jetty:jetty-websocket:8.2.0.v20160908" level="project" />
<orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.73" level="project" />
<orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" />
<orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" />
<orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec:1.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.foreverwin.modular:modular-melib:15.4.0.2.RELEASE" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.activity.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.annotation.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.appconfig.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.backgroundprocess.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.browse.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.certification.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.collaboration.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.common.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.container.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.customdata.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.datacollection.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.dataformat.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.datatransfer.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.datatype.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.demand.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.document.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.extension.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.framework.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.framework.api-internal:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.framework.globalization:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.integration.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.integration.cncdnc.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.integration.erp.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.inventory.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.labor.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.legacy.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.messaging.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.nonconformance.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.numbering.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.plant.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.productdefinition.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.production.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.productiondate.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.reasoncode.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.reporting.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.resourcetracking.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.sampling.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.schedulingstandards.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.script.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.security.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.setpoint.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.status.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.timeelement.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.tooling.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.uom.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.user.api:154.0.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:service-core.api:3.4.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:common-libs:3.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:sap-usermanagement-api:1.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.sap:me.common.domain:154.0.2" level="project" />
</component>
</module>

5
console/src/main/resources/application.yml
Unescape Escape View File

@ -35,9 +35,9 @@ spring:
time-zone: GMT+8generateLabel
date-format: yyyy-MM-dd HH:mm:ss
profiles:
# active: prd
active: prd
# active: qas
active: local
# active: local
# active: dev
# 文件上传
servlet:
@ -50,6 +50,7 @@ spring:
# 热部署开关
enabled: true
# MyBatis
mybatis-plus:
type-handlers-package: com.foreverwin.modular.core.mybatisplus.type

4
production/pom.xml
Unescape Escape View File

@ -45,5 +45,9 @@
<artifactId>freemarker</artifactId>
<version>2.3.30</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
</dependencies>
</project>

87
production/src/main/java/com/foreverwin/mesnac/production/controller/PodTemplateController.java
Unescape Escape View File

@ -1,10 +1,14 @@
package com.foreverwin.mesnac.production.controller;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.foreverwin.mesnac.common.dto.SfcDispatchDto;
import com.foreverwin.mesnac.common.model.InspectionTask;
import com.foreverwin.mesnac.common.util.HttpUtils;
import com.foreverwin.mesnac.common.util.StringUtil;
import com.foreverwin.mesnac.meapi.dto.LogisticsDto;
import com.foreverwin.mesnac.meapi.dto.SfcDto;
@ -16,10 +20,31 @@ import com.foreverwin.mesnac.meapi.service.RouterService;
import com.foreverwin.mesnac.production.service.PodTemplateService;
import com.foreverwin.modular.core.exception.BaseException;
import com.foreverwin.modular.core.util.R;
import org.apache.http.*;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.HttpClient;
import org.apache.http.client.config.RequestConfig;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
import org.jsoup.Connection;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpMethod;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.client.RestTemplate;
import java.io.*;
import java.net.HttpURLConnection;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.*;
@Controller
@ -122,6 +147,40 @@ public class PodTemplateController {
return R.ok();
}
@ResponseBody
@PostMapping("/sfcFirtCheck")
public R sfcFirtCheck(@RequestBody Map<String,Object> map) {
List<SfcDto> sfcDtoList = (List<SfcDto>) map.get("sfcDtoList");
ObjectMapper mapper = new ObjectMapper();
sfcDtoList = mapper.convertValue(sfcDtoList, new TypeReference<List<SfcDto>>() {
});
String resrce = (String) map.get("resrce");
String shoporder = (String) map.get("shopOrder");
if (sfcDtoList == null || sfcDtoList.size() < 1) {
throw new BaseException("作业列表不能为空");
}
if (sfcDtoList.size() != 1){
throw new BaseException("只能选择一条数据");
}
if (sfcDtoList.get(0).getQty()==1){
throw new BaseException("SFC:"+sfcDtoList.get(0).getSfc()+"数量为1,无法执行首件报检");
}
if (StringUtil.isBlank(resrce)) {
throw new BaseException("资源不能为空");
}
ArrayList<String> sfcList = new ArrayList<>();
try {
for (SfcDto sfcDto : sfcDtoList) {
String completeSfc = podTemplateService.sfcFirtCheck(sfcDto, resrce,shoporder);
sfcList.add(completeSfc);
}
}catch (Exception e){
return R.failed(sfcList,e.getMessage());
}
return R.ok();
}
/**
* 生产操作员面板工作列表
* @param sfcDto
@ -141,4 +200,32 @@ public class PodTemplateController {
public R getSfcInfo(Sfc sfc) {
return R.ok(podTemplateService.getInfoBySfc(sfc));
}
// public static void main(String[] args) throws IOException {
// Tyre tyre =new Tyre();
// tyre.setOuterTireNumber("123456");
// List<Tyre> tyreList = new ArrayList<>();
// tyreList.add(tyre);
// Map map=new HashMap();
// map.put("username","admin");
// map.put("password","admin123");
// Connection.Response s= HttpUtils.post("http://localhost:8080/login", JSON.toJSONString(map));
// Result result=JSONObject.parseObject(s.body(),Result.class);
// System.out.println(result.getToken());
// Map<String,String> stringStringMap=new HashMap<>();
// stringStringMap.put("Authorization","Bearer "+result.getToken());
// Connection.Response ss = HttpUtils.post("http://localhost:8080/basetyre/tyre/insertBaseTyres",stringStringMap,JSONObject.toJSONString(tyreList));
// System.out.println(ss.body());
// }
// static class Tyre{
// private String outerTireNumber;
//
// public String getOuterTireNumber() {
// return outerTireNumber;
// }
//
// public void setOuterTireNumber(String outerTireNumber) {
// this.outerTireNumber = outerTireNumber;
// }
// }
}

6
production/src/main/java/com/foreverwin/mesnac/production/controller/SplitSfcController.java
Unescape Escape View File

@ -2,6 +2,7 @@ package com.foreverwin.mesnac.production.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.foreverwin.mesnac.common.util.HttpUtils;
import com.foreverwin.mesnac.meapi.dto.SfcDto;
import com.foreverwin.mesnac.production.model.SplitSfc;
import com.foreverwin.mesnac.production.service.SplitSfcService;
@ -10,7 +11,10 @@ import com.foreverwin.modular.core.util.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
*
@ -148,4 +152,6 @@ public class SplitSfcController {
public R removeByIds(List<String> ids){
return R.ok(splitSfcService.removeByIds(ids));
}
}

5
production/src/main/java/com/foreverwin/mesnac/production/service/PodTemplateService.java
Unescape Escape View File

@ -15,7 +15,6 @@ public interface PodTemplateService {
Map<String, Object> sfcEnter(SfcDto workCenterDto);
Object getSfcInfo(SfcDto sfcDto);
void sfcStart(Map<String, Object> map);
@ -28,5 +27,7 @@ public interface PodTemplateService {
LogisticsDto Scansfc(Map paramMap);
// Map<String, Object> Scansfc(SfcDto sfcDto);
String sfcFirtCheck(SfcDto sfcDto, String resrce, String shoporder);
// Map<String, Object> Scansfc(SfcDto sfcDto);
}

157
production/src/main/java/com/foreverwin/mesnac/production/service/impl/PodTemplateServiceImpl.java
Unescape Escape View File

@ -29,6 +29,7 @@ import com.foreverwin.mesnac.dispatch.service.UserResourceService;
import com.foreverwin.mesnac.meapi.dto.*;
import com.foreverwin.mesnac.meapi.mapper.ResrceMapper;
import com.foreverwin.mesnac.meapi.mapper.SfcMapper;
import com.foreverwin.mesnac.meapi.model.*;
import com.foreverwin.mesnac.meapi.service.*;
import com.foreverwin.mesnac.production.mapper.SfcCrossMapper;
@ -114,14 +115,12 @@ public class PodTemplateServiceImpl implements PodTemplateService {
private UserResourceService userResourceService;
@Autowired
private RouterStepService routerStepService;
@Autowired
private SfcDispatchMapper sfcDispatchMapper;
@Autowired
public LogisticsTurnoverService logisticsTurnoverService;
@Autowired
private SfcMapper sfcMapper;
@ -382,10 +381,23 @@ public class PodTemplateServiceImpl implements PodTemplateService {
if (status.equals("404")) {
throw new BaseException("产品条码" + sfc + "已暂停");
}
BigDecimal workHour=BigDecimal.ZERO;
BigDecimal qty = new BigDecimal(sfcServiceById.getQty().toString());
if (!operation.equals("WX_6106GX")&&!operation.equals("HJ_6106JYGX")&&!operation.equals("HJ_6106JRGX")) {
String is_check = customFieldsService.getCustomFieldsValue(currentRevisionRef.getHandle(),"IS_CHECK");
//首件报检检验
String first_check = customFieldsService.getCustomFieldsValue(currentRevisionRef.getHandle(),"FIRST_CHECK");
if (StringUtil.isBlank(first_check)){
InspectionTask createTask = inspectionTaskService.isCreateTask(site, Constants.INSPECTION_TYPE_S, sfc, operation, stepId);
if (createTask == null && sfcDto.getQty()>1) {
throw new BaseException("请提交产品条码["+sfcDto.getSfc()+"]的首件检验任务");
}
if (createTask != null && createTask.getStatus().equals(Constants.INSPECTION_TASK_STATUS_COMPLETE)
&& createTask.getResult().equals(Constants.RSESULT_NG) && sfcDto.getQty()>1){
throw new BaseException("产品条码["+sfcDto.getSfc()+"]上次首检不合格,请再次执行首检报检");
}
}
if (StringUtil.isBlank(is_check)) {
//是否有自检检验项目
List<InspectionItemDetail> inspectionItemDetails = inspectionItemService.selectQualityInspection(sfc, operation, stepId, Constants.INSPECTION_TYPE_Z);
if (inspectionItemDetails.size() > 0 && inspectionItemDetails.get(0) != null) {
@ -398,6 +410,7 @@ public class PodTemplateServiceImpl implements PodTemplateService {
throw new BaseException("自检任务不合格，不能完成请检查");
}
}
//是否装配完成
List<Map<String, Object>> assembleList = sfcDataAssembleMapper.querySfcAssemble(HandleEnum.SFC_DISPATCH.getHandle(site, dispatchNo));
if (assembleList != null && assembleList.size() > 0) {
@ -424,10 +437,8 @@ public class PodTemplateServiceImpl implements PodTemplateService {
}
}
//物料消耗
materialConsumption(site, operation, HandleEnum.SFC.getHandle(site, sfc), stepId, resrce);
materialConsumption(site, operation, HandleEnum.SFC.getHandle(site, sfc), stepId, resrce);
//专检创建
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("SFC", sfc);
@ -478,16 +489,10 @@ public class PodTemplateServiceImpl implements PodTemplateService {
}
}
//完成工序为外协工序则找下道工序，生成跨车间转运任务
else if (operation.equals("WX_6106GX")){
//找下道工序
try {
CreateLogisticsTask(sfcDispatchById,sfcDto.getItem());
}catch (Exception e){
ExceptionUtil.throwException(e);
}
else {
CreateLogisticsTask(sfcDispatchById,sfcDto.getItem());
}
try {
sfcCrossService.completeAction(site, currentRevisionRef.getHandle(), resrce, sfcServiceById.getHandle(), qty);
@ -504,7 +509,6 @@ public class PodTemplateServiceImpl implements PodTemplateService {
* 如果下道工序为检验工序或者检入工序，1、先判断工序派工情况
*/
/**
* 判断是否为返修工序、返修工序不报工
*/
@ -733,42 +737,114 @@ public class PodTemplateServiceImpl implements PodTemplateService {
//转运任务
return logisticsDto;
}
@Override
public String sfcFirtCheck(SfcDto sfcDto, String resrce, String shoporder) {
String site = CommonMethods.getSite();
String operation = sfcDto.getOperation();
String sfc = sfcDto.getSfc();
String stepId = sfcDto.getStepId();
String dispatchNo = sfcDto.getDispatchNo();
Sfc sfcServiceById = sfcService.getById(HandleEnum.SFC.getHandle(site, sfc));
String status = StringUtil.trimHandle(sfcServiceById.getStatusBo());
//首件报检检验
String first_check = customFieldsService.getCustomFieldsValue(HandleEnum.OPERATION.getHandle(site,operation,"1.0"),"FIRST_CHECK");
if (StringUtil.notBlank(first_check)){
throw new BaseException("工序【"+sfcDto.getOperationDescription()+"】不需要首检！");
}
if (status.equals("404")) {
throw new BaseException("产品条码" + sfc + "已暂停");
}
//专检创建
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("SFC", sfc);
paramMap.put("SHOP_ORDER", StringUtil.trimHandle(sfcServiceById.getShopOrderBo()));
paramMap.put("OPERATION", operation);
paramMap.put("STEP_ID", stepId);
String workShopBo = commonService.getWorkShopBo(HandleEnum.RESOURCE.getHandle(site, resrce));
if (StringUtil.isBlank(workShopBo)){
throw new BaseException("设备与车间关系未维护");
}
paramMap.put("WORK_CENTER", StringUtil.trimHandle(workShopBo));
paramMap.put("RESRCE", resrce);
paramMap.put("SFC_DISPATCH_DETAIL_BO", HandleEnum.SFC_DISPATCH.getHandle(site, dispatchNo));
///查询此SFC此工序是否有首检任务
paramMap.put("CATEGORY", Constants.INSPECTION_TYPE_S);
inspectionTaskService.createFirstTask(paramMap);
return sfc;
}
public void CreateLogisticsTask(SfcDispatch request,String item) {
// SfcDispatch sfcDispatchById = sfcDispatchService.getById(request.getSfcdispatchBo());
String site = CommonMethods.getSite();
SfcDispatch sfcDispatchById = sfcDispatchService.getById(HandleEnum.SFC_DISPATCH.getHandle(site, request.getSfc() + "-" + request.getStepId()));
// Router router = routerService.getById(sfcDispatchById.getRouterBo());
//找下道工序 (返修工序除外)
// if (!router.getRouterType().equals("C")) {
SfcDispatch nextsfcDispatch=null;
String dispatchNo = request.getSfc() + "-" + request.getStepId();
List<String> stringList=new ArrayList<>();
stringList.add("HJ_6106JYGX");
stringList.add("HJ_6106JRGX");
boolean flag=false;
if(sfcDispatchById.getStepId().startsWith("9")){
//找下道工序
for (int i = 1; i < 50; i++) {
QueryWrapper<SfcDispatch> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(SfcDispatch.SFC, sfcDispatchById.getSfc());
queryWrapper.eq(SfcDispatch.SHOP_ORDER, sfcDispatchById.getShopOrder());
queryWrapper.eq(SfcDispatch.DISPATCH_SEQ, String.valueOf(Integer.parseInt(sfcDispatchById.getDispatchSeq()) + i));
queryWrapper.like(SfcDispatch.ROUTER_BO, sfcDispatchById.getRouterBo().substring(0,sfcDispatchById.getRouterBo().lastIndexOf(",")));
// queryWrapper.eq(SfcDispatch.ROUTER_BO,sfcDispatchById.getRouterBo());
// queryWrapper.like(SfcDispatch.ROUTER_BO, sfcDispatchById.getRouterBo().substring(0,sfcDispatchById.getRouterBo().lastIndexOf(",")));
queryWrapper.eq(SfcDispatch.ROUTER_BO,sfcDispatchById.getRouterBo());
nextsfcDispatch = sfcDispatchService.getOne(queryWrapper);
//外协工序后的检入工序：直接触发给入库
if (nextsfcDispatch != null && "HJ_6106JRGX".equals(nextsfcDispatch.getOperation())) {
nextsfcDispatch.setOperation(nextsfcDispatch.getOperation());
nextsfcDispatch.setStepId(nextsfcDispatch.getStepId());
nextsfcDispatch.setWorkCenter("BCP");
if (nextsfcDispatch != null && !stringList.contains(nextsfcDispatch.getOperation())
&& !nextsfcDispatch.getWorkCenter().equals(sfcDispatchById.getWorkCenter())) {
flag=true;
break;
}
else if (nextsfcDispatch != null && !stringList.contains(nextsfcDispatch.getOperation())
&& nextsfcDispatch.getWorkCenter().equals(sfcDispatchById.getWorkCenter())) {
flag=false;
break;
}
else if (nextsfcDispatch != null && stringList.contains(nextsfcDispatch.getOperation())){
continue;
}
else if (nextsfcDispatch == null){
/**
* 找正在排队的工序
*/
Map map = sfcMapper.findOperationBySfc(site, sfcDispatchById.getSfc());
if (map !=null){
SfcDispatch sfc_inwork = sfcDispatchService.getById(HandleEnum.SFC_DISPATCH.getHandle(site, sfcDispatchById.getSfc() + "-" + map.get("STEP_ID")));
if (sfc_inwork !=null &&!sfcDispatchById.getWorkCenter().equals(sfc_inwork.getWorkCenter())
&& !stringList.contains(sfc_inwork.getWorkCenter())){
nextsfcDispatch=new SfcDispatch();
nextsfcDispatch.setOperation(sfc_inwork.getOperation());
nextsfcDispatch.setStepId(sfc_inwork.getStepId());
nextsfcDispatch.setWorkCenter(sfc_inwork.getWorkCenter());
flag=true;
break;
}
}
}
}
}else {
//找下道工序
for (int i = 1; i < 50; i++) {
QueryWrapper<SfcDispatch> queryWrapper = new QueryWrapper<>();
queryWrapper.eq(SfcDispatch.SFC, sfcDispatchById.getSfc());
queryWrapper.eq(SfcDispatch.SHOP_ORDER, sfcDispatchById.getShopOrder());
queryWrapper.eq(SfcDispatch.DISPATCH_SEQ, String.valueOf(Integer.parseInt(sfcDispatchById.getDispatchSeq()) + i));
queryWrapper.like(SfcDispatch.ROUTER_BO, sfcDispatchById.getRouterBo().substring(0,sfcDispatchById.getRouterBo().lastIndexOf(",")));
// queryWrapper.eq(SfcDispatch.ROUTER_BO,sfcDispatchById.getRouterBo());
nextsfcDispatch = sfcDispatchService.getOne(queryWrapper);
if (nextsfcDispatch != null && !stringList.contains(nextsfcDispatch.getOperation())
&& !nextsfcDispatch.getWorkCenter().equals(sfcDispatchById.getWorkCenter())) {
flag=true;
break;
}
else if (nextsfcDispatch != null && !stringList.contains(nextsfcDispatch.getOperation())
&& nextsfcDispatch.getWorkCenter().equals(sfcDispatchById.getWorkCenter())) {
flag=false;
@ -777,26 +853,27 @@ public class PodTemplateServiceImpl implements PodTemplateService {
else if (nextsfcDispatch != null && stringList.contains(nextsfcDispatch.getOperation())){
continue;
}
else if (nextsfcDispatch == null ) {
else if (nextsfcDispatch == null){
QueryWrapper<SfcDispatch> queryWrappers = new QueryWrapper<>();
queryWrappers.eq(SfcDispatch.SFC, sfcDispatchById.getSfc());
queryWrappers.eq(SfcDispatch.SHOP_ORDER, sfcDispatchById.getShopOrder());
queryWrappers.eq(SfcDispatch.DISPATCH_SEQ, String.valueOf(Integer.parseInt(sfcDispatchById.getDispatchSeq()) + (i-1)));
queryWrappers.like(SfcDispatch.ROUTER_BO, sfcDispatchById.getRouterBo().substring(0,sfcDispatchById.getRouterBo().lastIndexOf(",")));
// queryWrappers.eq(SfcDispatch.ROUTER_BO,sfcDispatchById.getRouterBo());
// queryWrappers.eq(SfcDispatch.ROUTER_BO,sfcDispatchById.getRouterBo());
nextsfcDispatch = sfcDispatchService.getOne(queryWrappers);
if (nextsfcDispatch.getOther2() != null && Constants.RK.equals(nextsfcDispatch.getOther2()) && stringList.contains(nextsfcDispatch.getOperation())){
if (nextsfcDispatch.getOther2() != null
&& Constants.RK.equals(nextsfcDispatch.getOther2()) && stringList.contains(nextsfcDispatch.getOperation())){
nextsfcDispatch.setOperation(nextsfcDispatch.getOperation());
nextsfcDispatch.setStepId(nextsfcDispatch.getStepId());
nextsfcDispatch.setWorkCenter("BCP");
}else {
} else {
return;
}
flag=true;
break;
}
}
}
if (flag){
LogisticsTurnover logisticsTurnover = new LogisticsTurnover();
logisticsTurnover.setHandle("LogisticsBO:1000" + "," + UUID.randomUUID().toString());
@ -811,21 +888,11 @@ public class PodTemplateServiceImpl implements PodTemplateService {
logisticsTurnover.setTurnoutItem(item);
logisticsTurnover.setTurnoutWorkcenter(sfcDispatchById.getWorkCenter());
try {
if (request.getOperation().equals("WX_6106GX")){
logisticsTurnover.setComDateTime(LocalDateTime.now());
logisticsTurnover.setStatus("COM");
logisticsTurnover.setuserId("WX000001");
logisticsTurnover.setUserName("外协虚拟");
}
logisticsTurnoverService.save(logisticsTurnover);
} catch (Exception e) {
throw new BaseException("周转任务生成失败");
}
}
// }
}
}

1
quality/src/main/java/com/foreverwin/mesnac/quality/controller/InspectionTaskManageController.java
Unescape Escape View File

@ -28,7 +28,6 @@ public class InspectionTaskManageController {
@PostMapping("/findInspectionTask")
public R findInspectionTask(@RequestBody InspectionTaskManageRequest inspectionTaskManageRequest) {
List<InspectionTaskManage> result;
try {
String site = CommonMethods.getSite();
inspectionTaskManageRequest.setSite(site);

9
quality/src/main/java/com/foreverwin/mesnac/quality/dto/InspectionTaskManageRequest.java
Unescape Escape View File

@ -17,6 +17,7 @@ public class InspectionTaskManageRequest implements Serializable {
private String item;
private String itemDescription;
private String operation;
private String wxDescription;
private String stepId;
private String checkUser;
private String dateFromStr;
@ -28,6 +29,14 @@ public class InspectionTaskManageRequest implements Serializable {
private String trueCheckUser;
private String dispatchUser;
public String getWxDescription() {
return wxDescription;
}
public void setWxDescription(String wxDescription) {
this.wxDescription = wxDescription;
}
public String getItemDescription() {
return itemDescription;
}

20
quality/src/main/java/com/foreverwin/mesnac/quality/service/impl/InspectionTaskManageServiceImpl.java
Unescape Escape View File

@ -189,10 +189,11 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ
* 1、先查询派工表（Z_SFC_DISPATCH）里的派工数据
* 2、根据派工表里的派工序号查找下道工序
* 3、如果两个工作中心不一样，就会生成转运待办任务
* 4、只有专检任务才会生成
*/
this.CreateLogisticsTask(request);
if (request.getCategory().equals(Constants.INSPECTION_TYPE_P)){
this.CreateLogisticsTask(request);
}
}
@ -262,7 +263,9 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ
request.setSfc(inspectionTaskManage.getSfc());
request.setStepId(inspectionTaskManage.getStepId());
request.setItem(inspectionTaskManage.getItem());
this.CreateLogisticsTask(request);
if (inspectionTaskManage.getCategory().equals(Constants.INSPECTION_TYPE_P)){
this.CreateLogisticsTask(request);
}
}
inspectionTaskModel.setStatus("SAVE".equals(type) ? Constants.INSPECTION_TASK_STATUS_DOING : Constants.INSPECTION_TASK_STATUS_COMPLETE);
inspectionTaskModel.setResult(result);
@ -300,7 +303,6 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ
// SfcDispatch sfcDispatchById = sfcDispatchService.getById(request.getSfcdispatchBo());
String site = CommonMethods.getSite();
SfcDispatch sfcDispatchById = sfcDispatchService.getById(HandleEnum.SFC_DISPATCH.getHandle(site, request.getSfc() + "-" + request.getStepId()));
Router router = routerService.getById(sfcDispatchById.getRouterBo());
List<String> stringList=new ArrayList<>();
stringList.add("HJ_6106JYGX");
stringList.add("HJ_6106JRGX");
@ -414,6 +416,12 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ
logisticsTurnover.setTurnoutItem(request.getItem());
logisticsTurnover.setTurnoutWorkcenter(sfcDispatchById.getWorkCenter());
try {
if (sfcDispatchById.getOperation().equals("WX_6106GX")){
logisticsTurnover.setComDateTime(LocalDateTime.now());
logisticsTurnover.setStatus("COM");
logisticsTurnover.setuserId("WX000001");
logisticsTurnover.setUserName("外协虚拟");
}
logisticsTurnoverService.save(logisticsTurnover);
/**
* 发送MQ消息
@ -422,7 +430,7 @@ public class InspectionTaskManageServiceImpl implements InspectionTaskManageServ
// Map messageMap=logisticsTurnoverMapper.messageMap();
// activeMQUtil.SendMessage("SendMessageHJ02");
} catch (Exception e) {
throw new BaseException("周转任务生成失败");
throw new BaseException("周转任务生成失败"+e.getMessage());
}
}

13
quality/src/main/resources/mapper/InspectionTaskManageMapper.xml
Unescape Escape View File

@ -40,12 +40,14 @@
</resultMap>
<select id="findInspectionTask" resultMap="BaseResultMap">
SELECT B.HANDLE, B.SITE, B.CATEGORY, B.TASK_NO, B.DESCRIPTION, B.STATUS, B.INSPECTION_ITEM_BO, B.WORK_CENTER, B.SHOP_ORDER, B.SFC,B.STEP_ID, B.OPERATION, B.STEP_ID, B.RESRCE, B.RESULT,B.QUESTION_C, B.COMMENTS, B.CREATE_USER, B.CREATED_DATE_TIME, B.MODIFY_USER, B.MODIFIED_DATE_TIME,
SELECT B.HANDLE, B.SITE, B.CATEGORY, B.TASK_NO, B.DESCRIPTION, B.STATUS, B.INSPECTION_ITEM_BO, B.WORK_CENTER, B.SHOP_ORDER, B.SFC,B.STEP_ID, B.OPERATION, B.RESRCE, B.RESULT,B.QUESTION_C, B.COMMENTS, B.CREATE_USER, B.CREATED_DATE_TIME, B.MODIFY_USER, B.MODIFIED_DATE_TIME,
M.ITEM,M.HANDLE ITEM_BO, Z.DESCRIPTION ITEM_DESCRIPTION,ZNU.FULL_NAME FULL_NAME,RS.DESCRIPTION RESRCE_DESCRIPTION,
O.OPERATION OPERATION,OT.DESCRIPTION OPERATION_DESCRIPTION,ZSD.DISPATCH_QTY SFC_QTY,B.COMMENTS COMMENTS,
O.OPERATION OPERATION,B.COMMENTS COMMENTS,
ZSD.EMPLOYEE_DESCRIPTION DISPATCH_USER,P.SHOP_ORDER,NVL(ZAB.NC_QTY, 0) NC_QTY,B.SFC_DISPATCH_BO,CF.VALUE MAIN_CHECK_USER,
CASE WHEN B.CATEGORY = 'S' THEN '1' ELSE TO_CHAR( ZSD.DISPATCH_QTY ) END SFC_QTY,
CASE WHEN B.STATUS = 'COMPLETE' THEN TO_CHAR(ZNU2.FULL_NAME) ELSE '' END CHECK_USER,
CASE WHEN B.STATUS = 'COMPLETE' THEN TO_CHAR(B.MODIFIED_DATE_TIME,'yyyy-mm-dd hh24:mi:ss') ELSE '' END CHECK_DATE_TIME
CASE WHEN B.STATUS = 'COMPLETE' THEN TO_CHAR(B.MODIFIED_DATE_TIME,'yyyy-mm-dd hh24:mi:ss') ELSE '' END CHECK_DATE_TIME,
CASE WHEN B.OPERATION='WX_6106GX' THEN OT.DESCRIPTION || '('|| CFS.VALUE || ')' ELSE OT.DESCRIPTION END OPERATION_DESCRIPTION
FROM Z_INSPECTION_TASK B
INNER JOIN RESRCE RS ON B.SITE = RS.SITE AND RS.RESRCE = B.RESRCE
INNER JOIN OPERATION O ON O.OPERATION = B.OPERATION AND O.SITE = B.SITE
@ -60,6 +62,7 @@
LEFT JOIN Z_NWA_USER ZNU2 ON ZNU2.USER_NAME = B.MODIFY_USER
LEFT JOIN ITEM_T Z ON Z.ITEM_BO = M.HANDLE AND Z.LOCALE = 'zh'
LEFT JOIN Z_ABNORMAL_BILL ZAB ON B.HANDLE = ZAB.OBJECT_BO
LEFT JOIN CUSTOM_FIELDS CFS ON CFS.HANDLE = 'RouterOperationBO:RouterStepBO:'||ZSD.ROUTER_BO||','||B.STEP_ID AND CFS.ATTRIBUTE='SOURCE_DESCRIPTION'
WHERE B.SITE = #{site}
<if test="workCenter != null and workCenter != ''">
AND B.WORK_CENTER = #{workCenter}
@ -120,6 +123,10 @@
<if test="result != null and result != ''">
AND B.RESULT = #{result}
</if>
<if test="wxDescription != null and wxDescription != ''">
AND CFS.VALUE like '%'||#{wxDescription}||'%'
</if>
ORDER BY B.CREATED_DATE_TIME DESC
</select>

Write Preview
Loading…
Cancel
Save