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

Merge remote-tracking branch 'origin/master'

Browse Source
master
philip 3 years ago
parent dc272560d2 6104256f19
commit fc0285bf3c
25 changed files with 127 additions and 247 deletions
Show Stats Download Patch File Download Diff File

2
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/controller/AbnormalBillController.java
Unescape Escape View File

@ -12,6 +12,7 @@ import com.foreverwin.mesnac.common.service.SfcDispatchCommonService;
import com.foreverwin.mesnac.meapi.service.NcCodeService;
import com.foreverwin.modular.core.util.FrontPage;
import com.foreverwin.modular.core.util.R;
import com.sap.me.frame.service.CommonMethods;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -78,6 +79,7 @@ public class AbnormalBillController {
public R page(FrontPage<AbnormalBill> frontPage, AbnormalBill abnormalBill){
IPage result;
QueryWrapper<AbnormalBill> queryWrapper = new QueryWrapper<>();
abnormalBill.setSite(CommonMethods.getSite());
queryWrapper.setEntity(abnormalBill);
if (frontPage.getGlobalQuery() != null && !"".equals(frontPage.getGlobalQuery().trim())) {
//TODO modify global query

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

@ -162,6 +162,8 @@ public class AbnormalBillLogServiceImpl extends ServiceImpl<AbnormalBillLogMappe
ncGroup.append(ncGroups.get(i)).append(",");
}
}
abnormalBillLog.setInspector(abnormalBillLog.getInspector());
abnormalBillLog.setPbUser(abnormalBillLog.getPbUser());
abnormalBillLog.setNcCodeGroup(ncGroup.toString());
abnormalBillLog.setCreatedUser(user);
abnormalBillLog.setCreatedDataTime(now);

7
anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java
Unescape Escape View File

@ -232,7 +232,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
//判断是否是用户自报,如果是自报的话，调用孙豪的方法
if(!StringUtil.isBlank(abnormalBill.getInspector()) && Constants.NEW.equals(abnormalBill.getStatus())){
if(!StringUtil.isBlank(abnormalBill.getInspector()) && Constants.NEW.equals(abnormalBill.getStatus()) &&"B".equals(abnormalBill.getReportFrom())){
abnormalBill.setObjectBo(HandleEnum.SELF_REPORT.getHandle(abnormalBill.getSite(),abnormalBill.getObjectBo()));
selfReportService.updateState(abnormalBill.getObjectBo(), Constants.STATE_CONFIRM);
}
@ -274,8 +274,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl<AbnormalBillMapper, Abn
abnormalNcCode.setModifiedDateTime(now);
abnormalNcCodes.add(abnormalNcCode);
}
abnormalNcCodeService.saveOrUpdateBatch(abnormalNcCodes);
if(abnormalNcCodes.size() > 0){
abnormalNcCodeService.saveOrUpdateBatch(abnormalNcCodes);
}
abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose);
this.saveOrUpdate(abnormalBill);
/**

4
anomaly/src/main/resources/mapper/AbnormalBillMapper.xml
Unescape Escape View File

@ -437,12 +437,12 @@
<if test="ew.entity.modifiedDateTime!=null"> AND MODIFIED_DATE_TIME=#{ew.entity.modifiedDateTime}</if>
</if>
<if test="ew!=null and ew.sqlSegment!=null and ew.nonEmptyOfWhere">
${ew.sqlSegment}
AND ${ew.sqlSegment}
</if>
</if>
</where>
<if test="ew!=null and ew.sqlSegment!=null and ew.emptyOfWhere">
${ew.sqlSegment}
AND ${ew.sqlSegment}
</if>
</select>

18
common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruIn.java
Unescape Escape View File

@ -476,22 +476,4 @@ public class ZprodordconfStruIn implements java.io.Serializable {
_javaType, _xmlType, typeDesc);
}
@Override
public String toString() {
return "ZprodordconfStruIn{" +
"aufnr='" + aufnr + '\'' +
", vornr='" + vornr + '\'' +
", aueru='" + aueru + '\'' +
", lmnga=" + lmnga +
", xmnga=" + xmnga +
", ism01=" + ism01 +
", ism02=" + ism02 +
", ism03=" + ism03 +
", ism04=" + ism04 +
", ism05=" + ism05 +
", ism06=" + ism06 +
", __equalsCalc=" + __equalsCalc +
", __hashCodeCalc=" + __hashCodeCalc +
'}';
}
}

19
common/src/main/java/com/foreverwin/mesnac/common/erp/ZprodordconfStruOut.java
Unescape Escape View File

@ -512,23 +512,4 @@ public class ZprodordconfStruOut implements java.io.Serializable {
_javaType, _xmlType, typeDesc);
}
@Override
public String toString() {
return "ZprodordconfStruOut{" +
"aufnr='" + aufnr + '\'' +
", vornr='" + vornr + '\'' +
", aueru='" + aueru + '\'' +
", lmnga=" + lmnga +
", ism01=" + ism01 +
", ism02=" + ism02 +
", ism03=" + ism03 +
", ism04=" + ism04 +
", ism05=" + ism05 +
", ism06=" + ism06 +
", ret='" + ret + '\'' +
", msg='" + msg + '\'' +
", __equalsCalc=" + __equalsCalc +
", __hashCodeCalc=" + __hashCodeCalc +
'}';
}
}

1
common/src/main/java/com/foreverwin/mesnac/common/erp/document.wsdl
View File

File diff suppressed because one or more lines are too long

182
common/src/main/java/com/foreverwin/mesnac/common/erp/saperp.wsdl
Unescape Escape View File

@ -1,182 +0,0 @@
<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="urn:sap-com:document:sap:soap:functions:mc-style" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:n1="urn:sap-com:document:sap:rfc:functions" targetNamespace="urn:sap-com:document:sap:soap:functions:mc-style">
<wsdl:documentation>
<sidl:sidl xmlns:sidl="http://www.sap.com/2007/03/sidl"/>
</wsdl:documentation>
<wsp:UsingPolicy wsdl:required="true"/>
<wsp:Policy wsu:Id="BN_ZWS_ZMES_PRODORDCONF">
<wsaw:UsingAddressing xmlns:wsaw="http://schemas.xmlsoap.org/ws/2004/08/addressing"/>
<saptrnbnd:OptimizedXMLTransfer xmlns:saptrnbnd="http://www.sap.com/webas/710/soap/features/transportbinding/" uri="http://xml.sap.com/2006/11/esi/esp/binxml" wsp:Optional="true"/>
<sapattahnd:Enabled xmlns:sapattahnd="http://www.sap.com/710/features/attachment/">false</sapattahnd:Enabled>
<wsp:ExactlyOne xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:sapsp="http://www.sap.com/webas/630/soap/features/security/policy" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:wsu="http://schemas.xmlsoap.org/ws/2002/07/utility">
<wsp:All>
<sp:TransportBinding>
<wsp:Policy>
<sp:TransportToken>
<wsp:Policy>
<sp:HttpsToken>
<wsp:Policy>
<sp:HttpBasicAuthentication/>
</wsp:Policy>
</sp:HttpsToken>
</wsp:Policy>
</sp:TransportToken>
<sp:AlgorithmSuite>
<wsp:Policy>
<sp:TripleDesRsa15/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
<wsp:Policy>
<sp:Strict/>
</wsp:Policy>
</sp:Layout>
</wsp:Policy>
</sp:TransportBinding>
</wsp:All>
</wsp:ExactlyOne>
</wsp:Policy>
<wsp:Policy wsu:Id="IF_zws_zmes_PRODORDCONF">
<sapsession:Session xmlns:sapsession="http://www.sap.com/webas/630/soap/features/session/">
<sapsession:enableSession>false</sapsession:enableSession>
</sapsession:Session>
<wsp:ExactlyOne xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:sapsp="http://www.sap.com/webas/630/soap/features/security/policy" xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:wsu="http://schemas.xmlsoap.org/ws/2002/07/utility"/>
</wsp:Policy>
<wsp:Policy wsu:Id="OP_ZmesProdordconf">
<sapcomhnd:enableCommit xmlns:sapcomhnd="http://www.sap.com/NW05/soap/features/commit/">false</sapcomhnd:enableCommit>
<sapblock:enableBlocking xmlns:sapblock="http://www.sap.com/NW05/soap/features/blocking/">true</sapblock:enableBlocking>
<saptrhnw05:required xmlns:saptrhnw05="http://www.sap.com/NW05/soap/features/transaction/">no</saptrhnw05:required>
<saprmnw05:enableWSRM xmlns:saprmnw05="http://www.sap.com/NW05/soap/features/wsrm/">false</saprmnw05:enableWSRM>
</wsp:Policy>
<wsdl:types>
<xsd:schema attributeFormDefault="qualified" targetNamespace="urn:sap-com:document:sap:rfc:functions">
<xsd:simpleType name="char1">
<xsd:restriction base="xsd:string">
<xsd:maxLength value="1"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="char12">
<xsd:restriction base="xsd:string">
<xsd:maxLength value="12"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="char4">
<xsd:restriction base="xsd:string">
<xsd:maxLength value="4"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="char50">
<xsd:restriction base="xsd:string">
<xsd:maxLength value="50"/>
</xsd:restriction>
</xsd:simpleType>
<xsd:simpleType name="quantum13.3">
<xsd:restriction base="xsd:decimal">
<xsd:totalDigits value="13"/>
<xsd:fractionDigits value="3"/>
</xsd:restriction>
</xsd:simpleType>
</xsd:schema>
<xsd:schema xmlns:n0="urn:sap-com:document:sap:rfc:functions" attributeFormDefault="qualified" targetNamespace="urn:sap-com:document:sap:soap:functions:mc-style">
<xsd:import namespace="urn:sap-com:document:sap:rfc:functions"/>
<xsd:complexType name="ZprodordconfStruIn">
<xsd:sequence>
<xsd:element name="Aufnr" type="n0:char12"/>
<xsd:element name="Vornr" type="n0:char4"/>
<xsd:element name="Aueru" type="n0:char1"/>
<xsd:element name="Lmnga" type="n0:quantum13.3"/>
<xsd:element name="Xmnga" type="n0:quantum13.3"/>
<xsd:element name="Ism01" type="n0:quantum13.3"/>
<xsd:element name="Ism02" type="n0:quantum13.3"/>
<xsd:element name="Ism03" type="n0:quantum13.3"/>
<xsd:element name="Ism04" type="n0:quantum13.3"/>
<xsd:element name="Ism05" type="n0:quantum13.3"/>
<xsd:element name="Ism06" type="n0:quantum13.3"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="ZprodordconfStruOut">
<xsd:sequence>
<xsd:element name="Aufnr" type="n0:char12"/>
<xsd:element name="Vornr" type="n0:char4"/>
<xsd:element name="Aueru" type="n0:char1"/>
<xsd:element name="Lmnga" type="n0:quantum13.3"/>
<xsd:element name="Ism01" type="n0:quantum13.3"/>
<xsd:element name="Ism02" type="n0:quantum13.3"/>
<xsd:element name="Ism03" type="n0:quantum13.3"/>
<xsd:element name="Ism04" type="n0:quantum13.3"/>
<xsd:element name="Ism05" type="n0:quantum13.3"/>
<xsd:element name="Ism06" type="n0:quantum13.3"/>
<xsd:element name="Ret" type="n0:char1"/>
<xsd:element name="Msg" type="n0:char50"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="TableOfZprodordconfStruIn">
<xsd:sequence>
<xsd:element name="item" type="tns:ZprodordconfStruIn" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:complexType name="TableOfZprodordconfStruOut">
<xsd:sequence>
<xsd:element name="item" type="tns:ZprodordconfStruOut" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
<xsd:element name="ZmesProdordconf">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="InItab" type="tns:TableOfZprodordconfStruIn" minOccurs="0"/>
<xsd:element name="OutItab" type="tns:TableOfZprodordconfStruOut" minOccurs="0"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
<xsd:element name="ZmesProdordconfResponse">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="InItab" type="tns:TableOfZprodordconfStruIn"/>
<xsd:element name="OutItab" type="tns:TableOfZprodordconfStruOut"/>
<xsd:element name="Ret" type="n0:char1"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>
</xsd:schema>
</wsdl:types>
<wsdl:message name="ZmesProdordconf">
<wsdl:part name="parameters" element="tns:ZmesProdordconf"/>
</wsdl:message>
<wsdl:message name="ZmesProdordconfResponse">
<wsdl:part name="parameter" element="tns:ZmesProdordconfResponse"/>
</wsdl:message>
<wsdl:portType name="zws_zmes_PRODORDCONF">
<wsp:Policy>
<wsp:PolicyReference URI="#IF_zws_zmes_PRODORDCONF"/>
</wsp:Policy>
<wsdl:operation name="ZmesProdordconf">
<wsp:Policy>
<wsp:PolicyReference URI="#OP_ZmesProdordconf"/>
</wsp:Policy>
<wsdl:input message="tns:ZmesProdordconf"/>
<wsdl:output message="tns:ZmesProdordconfResponse"/>
</wsdl:operation>
</wsdl:portType>
<wsdl:binding name="ZWS_ZMES_PRODORDCONF" type="tns:zws_zmes_PRODORDCONF">
<wsp:Policy>
<wsp:PolicyReference URI="#BN_ZWS_ZMES_PRODORDCONF"/>
</wsp:Policy>
<wsa:EndpointReference xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing">
<wsa:ReferenceParameters/>
</wsa:EndpointReference>
<soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
<wsdl:operation name="ZmesProdordconf">
<soap:operation soapAction="" style="document"/>
<wsdl:input>
<soap:body use="literal"/>
</wsdl:input>
<wsdl:output>
<soap:body use="literal"/>
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="ZWS_ZMES_PRODORDCONF">
<wsdl:port name="ZWS_ZMES_PRODORDCONF" binding="tns:ZWS_ZMES_PRODORDCONF">
<soap:address location="http://sapdev.mesnac.com:8000/sap/bc/srt/rfc/sap/zws_zmes_prodordconf/302/zws_zmes_prodordconf/zws_zmes_prodordconf"/>
</wsdl:port>
</wsdl:service>
</wsdl:definitions>

8
console/src/main/resources/application-local.yml
Unescape Escape View File

@ -58,11 +58,11 @@ activemq:
#WebService
ws:
erp:
server: 172.16.251.223
server: srm.mesnac.com
port: 8000
user: mesd001
pwd: a123456
valid: N
user: mes001
pwd: mesprd
valid: Y
#quartz任务启用
quartz:

10
console/src/main/resources/application-prd.yml
Unescape Escape View File

@ -9,7 +9,7 @@ spring:
jndi-name: jdbc/jts/wipPool
activemq:
enabled: true
brokerUrl: tcp://172.16.251.166:61616?wireFormat.maxInactivityDuration=0
brokerUrl: tcp://172.16.170.166:61616?wireFormat.maxInactivityDuration=0
password: admin
user: admin
pool:
@ -18,7 +18,7 @@ spring:
#发送消息
activemq:
brokerUrl: tcp://172.16.251.164:61616?wireFormat.maxInactivityDuration=0
brokerUrl: tcp://172.16.170.164:61616?wireFormat.maxInactivityDuration=0
password: admin
user: admin
pool:
@ -32,18 +32,18 @@ ws:
port: 8000
user: mes001
pwd: mesprd
valid: N
valid: Y
#ftp
ftp:
host: 172.16.251.165
host: 172.16.170.165
port: 21
username: mesftp
password: mesnac1@3
#打印服务
print:
server: http://10.10.170.32:8022/print/mesnacprint
server: http://172.16.170.163:8022/print/mesnacprint
#文件模板路径
exportDocument:

17
console/src/test/java/com/foreverwin/mesnac/console/TmdMc.java
Unescape Escape View File

@ -22,8 +22,8 @@ public class TmdMc {
@Test
public void callErpWebService() throws RemoteException {
String shopOrder = "SO20210714";
String stepId = "OP001";
String shopOrder = "000100434347";
String stepId = "0060";
//请求参数
@ -57,7 +57,6 @@ public class TmdMc {
struOut.setAufnr(shopOrder);
struOut.setVornr(stepId);
struOut.setAueru("1");
struOut.setLmnga(new BigDecimal(1));
struOut.setRet("");
struOut.setMsg("");
outs[0] = struOut;
@ -65,9 +64,13 @@ public class TmdMc {
//调用WS
ERPAPI.erpWebService().zmesProdordconf(inHolder, outHolder);
//状态： S|成功， E|失败
String status = outHolder.value[1].getRet();
String message = outHolder.value[1].getMsg();
System.out.println("ERP接口返回：状态:" + status + ",消息:" + message);
if (outHolder == null || outHolder.value == null || outHolder.value.length <= 0) {
System.out.println("ERP接口失败");
} else {
//状态： S|成功， E|失败
String status = outHolder.value[1].getRet();
String message = outHolder.value[1].getMsg();
System.out.println("ERP接口返回：状态:" + status + ",消息:" + message);
}
}
}

4
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java
Unescape Escape View File

@ -294,7 +294,7 @@ public class CallItemController {
*/
@ResponseBody
@GetMapping("/findIssueItemListPda")
public R findIssueItemListPda(String workCenter, String resource, String item,String requiredFromDate, String requiredToDate, Boolean matchResource) {
public R findIssueItemListPda(String workCenter, String resource, String item,String spec,String texture,String requiredFromDate, String requiredToDate, Boolean matchResource) {
List<CallItem> result;
try {
String site = CommonMethods.getSite();
@ -306,6 +306,8 @@ public class CallItemController {
issueItemDto.setWorkCenter(workCenter);
issueItemDto.setMatchResource(matchResource);
issueItemDto.setItem(item);
issueItemDto.setSpec(spec);
issueItemDto.setTexture(texture);
if (StringUtil.notBlank(requiredFromDate)) {
issueItemDto.setRequiredFromDT(LocalDate.parse(requiredFromDate, DateTimeFormatter.ISO_DATE));
}

18
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/dto/IssueItemDto.java
Unescape Escape View File

@ -15,6 +15,8 @@ public class IssueItemDto implements Serializable {
private Boolean matchResource;
private LocalDate requiredFromDT;
private LocalDate requiredToDT;
private String spec;
private String texture;
public String getSite() {
return site;
@ -95,4 +97,20 @@ public class IssueItemDto implements Serializable {
public void setRequiredToDT(LocalDate requiredToDT) {
this.requiredToDT = requiredToDT;
}
public String getSpec() {
return spec;
}
public void setSpec(String spec) {
this.spec = spec;
}
public String getTexture() {
return texture;
}
public void setTexture(String texture) {
this.texture = texture;
}
}

2
dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java
Unescape Escape View File

@ -453,6 +453,8 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
String component = callItem.getItem();
String itemGroup = callItem.getItemGroup();
BigDecimal reqQty = callItem.getDispatchQty();
// 需求件数
callItem.setDispatchQty(reqQty);
String blankingSize = callItem.getBlankingSize();
if (StringUtil.isBlank(blankingSize)) {

16
dispatch/src/main/resources/mapper/CallItemMapper.xml
Unescape Escape View File

@ -1032,6 +1032,8 @@
LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = 'zh'
LEFT JOIN ITEM I ON I.HANDLE = ZCI.COMPONENT_BO
LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = 'zh'
LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = I.HANDLE AND CFA."ATTRIBUTE" = 'MAT_SPEC'
LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = I.HANDLE AND CFB."ATTRIBUTE" = 'TEXTTURE'
LEFT JOIN ITEM_GROUP_MEMBER IGM ON IGM.ITEM_BO = ZCI.COMPONENT_BO
LEFT JOIN ITEM_GROUP IG ON IG.HANDLE = IGM.ITEM_GROUP_BO
WHERE ZCI.CALL_TYPE = 'MATERIAL' AND ZCI.STATUS = '802' AND ZCI.SITE = #{site}
@ -1050,6 +1052,12 @@
<if test="requiredToDT != null">
AND ZCI.REQUIRED_DATE_TIME &lt;= #{requiredToDT}
</if>
<if test="spec != null and spec != ''">
AND CFA.VALUE LIKE '%' || #{spec} || '%'
</if>
<if test="texture != null and texture != ''">
AND CFB.VALUE LIKE '%' || #{texture} || '%'
</if>
GROUP BY ZCI.COMPONENT_BO ,ZSD.WORK_CENTER ,WCT.DESCRIPTION ,I.ITEM ,IT.DESCRIPTION ,ZSD.BLANKING_SIZE ,IG.ITEM_GROUP
ORDER BY ZCI.COMPONENT_BO
</select>
@ -1065,6 +1073,8 @@
LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = WC.HANDLE AND WCT.LOCALE = 'zh'
LEFT JOIN ITEM I ON I.HANDLE = ZCI.COMPONENT_BO
LEFT JOIN ITEM_T IT ON IT.ITEM_BO = I.HANDLE AND IT.LOCALE = 'zh'
LEFT JOIN CUSTOM_FIELDS CFA ON CFA.HANDLE = I.HANDLE AND CFA."ATTRIBUTE" = 'MAT_SPEC'
LEFT JOIN CUSTOM_FIELDS CFB ON CFB.HANDLE = I.HANDLE AND CFB."ATTRIBUTE" = 'TEXTTURE'
LEFT JOIN ITEM_GROUP_MEMBER IGM ON IGM.ITEM_BO = ZCI.COMPONENT_BO
LEFT JOIN ITEM_GROUP IG ON IG.HANDLE = IGM.ITEM_GROUP_BO
LEFT JOIN RESRCE R ON R.RESRCE = ZCI.RESRCE AND R.SITE = ZCI.SITE
@ -1084,6 +1094,12 @@
<if test="requiredToDT != null">
AND ZCI.REQUIRED_DATE_TIME &lt;= #{requiredToDT}
</if>
<if test="spec != null and spec != ''">
AND CFA.VALUE LIKE '%' || #{spec} || '%'
</if>
<if test="texture != null and texture != ''">
AND CFB.VALUE LIKE '%' || #{texture} || '%'
</if>
GROUP BY ZCI.COMPONENT_BO ,ZSD.WORK_CENTER ,WCT.DESCRIPTION ,I.ITEM ,IT.DESCRIPTION ,ZSD.BLANKING_SIZE ,IG.ITEM_GROUP , ZCI.RESRCE, R.DESCRIPTION
ORDER BY ZCI.COMPONENT_BO
</select>

3
equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml
Unescape Escape View File

@ -731,7 +731,8 @@
</select>
<select id="findResourceTaskByResrceAndCategory" resultType="Integer">
SELECT COUNT(*) FROM Z_RESOURCE_INSPECT_TASK ZRIT
SELECT COUNT(*) FROM Z_RESOURCE_INSPECT_TASK ZRIT
INNER JOIN Z_RESOURCE_INSPECT_RESOURCE zrir ON ZRIR.RESOURCE_INSPECT_PLAN_BO = ZRIT.RESOURCE_INSPECT_PLAN_BO AND ZRIR.STATUS = '301'
WHERE ZRIT.SITE = #{site} AND ZRIT.RESRCE = #{resrce} AND ZRIT.CATEGORY = #{category} AND ZRIT.RESOURCE_INSPECT_PLAN_BO != #{planHandle}
</select>

14
meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/ShopOrderDto.java
Unescape Escape View File

@ -28,6 +28,12 @@ public class ShopOrderDto extends ShopOrder {
*/
private String workCenter;
/**
* 图号
* @return
*/
private String map;
public String getWorkOrder() {
return workOrder;
}
@ -59,4 +65,12 @@ public class ShopOrderDto extends ShopOrder {
public void setWorkCenter(String workCenter) {
this.workCenter = workCenter;
}
public String getMap() {
return map;
}
public void setMap(String map) {
this.map = map;
}
}

8
meapi/src/main/resources/mapper/ResrceMapper.xml
Unescape Escape View File

@ -611,4 +611,12 @@
</foreach>
GROUP BY RS.HANDLE, RS.SITE, RS.RESRCE, RS.DESCRIPTION, RS.STATUS_BO, RS.PROCESS_RESOURCE, RS.OPERATION_BO, RS.VALID_FROM, RS.VALID_TO, RS.SETUP_STATE, RS.CREATED_DATE_TIME, RS.MODIFIED_DATE_TIME
</select>
<!--设备是否点检-->
<select id="isInspectByResrce" resultType="java.lang.String">
SELECT CF.VALUE FROM RESRCE R
LEFT JOIN CUSTOM_FIELDS cf ON CF.HANDLE = R.HANDLE AND CF."ATTRIBUTE" = 'IS_SPOT'
WHERE R.RESRCE = #{resrce} AND R.SITE = #{site}
</select>
</mapper>

3
meapi/src/main/resources/mapper/ShopOrderMapper.xml
Unescape Escape View File

@ -1009,11 +1009,12 @@
<!--根据工单找出工作令号，项目号，产品类别-->
<select id="findByShopOrderBo" resultType="com.foreverwin.mesnac.meapi.dto.ShopOrderDto">
SELECT WO.VALUE WORK_ORDER,ITEM.VALUE ITEM_NUMBER,PC.VALUE PRODUCT_CATEGORY,WC.WORK_CENTER
SELECT WO.VALUE WORK_ORDER,ITEM.VALUE ITEM_NUMBER,PC.VALUE PRODUCT_CATEGORY,WC.WORK_CENTER,MAP.VALUE MAP
FROM SHOP_ORDER SO
LEFT JOIN CUSTOM_FIELDS WO ON WO.HANDLE = SO.HANDLE AND WO."ATTRIBUTE" = 'WORK_ORDER'
LEFT JOIN CUSTOM_FIELDS ITEM ON ITEM.HANDLE = SO.HANDLE AND ITEM."ATTRIBUTE" = 'ITEM_NUMBER'
LEFT JOIN CUSTOM_FIELDS PC ON PC.HANDLE = SO.HANDLE AND PC."ATTRIBUTE" = 'PRODUCT_CATEGORY'
LEFT JOIN CUSTOM_FIELDS MAP ON MAP.HANDLE = SO.HANDLE AND MAP."ATTRIBUTE" = 'MAP'
LEFT JOIN WORK_CENTER WC ON WC.HANDLE = SO.PLANNED_WORK_CENTER_BO
WHERE SO.HANDLE = #{handle}
</select>

2
production/src/main/java/com/foreverwin/mesnac/production/service/impl/SfcScrapServiceImpl.java
Unescape Escape View File

@ -159,7 +159,7 @@ public class SfcScrapServiceImpl extends ServiceImpl<SfcScrapMapper, SfcScrap> i
sfcScrap.setModifiedDateTime(now);
//向生产派工那边发送数据
podTemplateService.sendErp(sfcScrap.getSfc(),sfcScrap.getStepId(),BigDecimal.valueOf(0L),BigDecimal.valueOf(sfcScrap.getQty()),BigDecimal.valueOf(0L));
// podTemplateService.sendErp(sfcScrap.getSfc(),sfcScrap.getStepId(),BigDecimal.valueOf(0L),BigDecimal.valueOf(sfcScrap.getQty()),BigDecimal.valueOf(0L));
try{
//调用mes公共接口，报废

3
production/src/main/resources/mapper/SfcScrapMapper.xml
Unescape Escape View File

@ -436,7 +436,7 @@
CASE WHEN I1.VALUE != NULL THEN NVL(I1.VALUE * I.QTY_MULTIPLIER,0)
WHEN I2.VALUE != NULL THEN NVL(I2.VALUE * I.QTY_MULTIPLIER,0)
ELSE NVL(I.QTY_MULTIPLIER,0) END WEIGHT,NVL(I.ITEM,' ') ITEM,NVL(S.SFC,' ') SFC,NVL(it.DESCRIPTION,' ') ITEM_DESCRIPTION,
NVL(SO.SHOP_ORDER,' ') SHOP_ORDER,NVL(ZSS.DUTY_USER,' ') DUTY_USER
NVL(SO.SHOP_ORDER,' ') SHOP_ORDER,NVL(ZNU.FULL_NAME,' ') DUTY_USER
FROM
SHOP_ORDER SO
LEFT JOIN WORK_CENTER WC ON SO.PLANNED_WORK_CENTER_BO = WC.HANDLE
@ -448,6 +448,7 @@
LEFT JOIN OPERATION O ON O.OPERATION = ZSS.OPERATION AND O.SITE = SO.SITE
LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE AND OT.LOCALE = #{locale}
LEFT JOIN ITEM I ON I.HANDLE = SO.PLANNED_ITEM_BO
LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZSS.DUTY_USER
LEFT JOIN ITEM_T it ON it.ITEM_BO = I.HANDLE AND it.LOCALE = #{locale}
LEFT JOIN CUSTOM_FIELDS I1 ON I1.HANDLE = I.HANDLE AND I1."ATTRIBUTE" = 'PER_METER'
LEFT JOIN CUSTOM_FIELDS I2 ON I2.HANDLE = I.HANDLE AND I2."ATTRIBUTE" = 'PER_SQUARE_METER'

9
quality/src/main/java/com/foreverwin/mesnac/quality/model/InspectionTaskManage.java
Unescape Escape View File

@ -29,6 +29,7 @@ public class InspectionTaskManage implements Serializable {
private LocalDateTime createdDateTime;
private String modifyUser;
private LocalDateTime modifiedDateTime;
private String fullName;
private List<InspectionTaskManageDetail> inspectionTaskDetailList;
@ -215,4 +216,12 @@ public class InspectionTaskManage implements Serializable {
public void setInspectionTaskDetailList(List<InspectionTaskManageDetail> inspectionTaskDetailList) {
this.inspectionTaskDetailList = inspectionTaskDetailList;
}
public String getFullName() {
return fullName;
}
public void setFullName(String fullName) {
this.fullName = fullName;
}
}

15
quality/src/main/java/com/foreverwin/mesnac/quality/model/SelfReport.java
Unescape Escape View File

@ -151,6 +151,13 @@ public class SelfReport extends Model<SelfReport> {
@TableField(exist = false)
private String productCategory;
/**
* 传过去的User
* @return
*/
@TableField(exist = false)
private String pbUser;
public String getProductCategory() {
return productCategory;
}
@ -343,6 +350,14 @@ public class SelfReport extends Model<SelfReport> {
this.description = description;
}
public String getPbUser() {
return pbUser;
}
public void setPbUser(String pbUser) {
this.pbUser = pbUser;
}
public static final String HANDLE = "HANDLE";
public static final String SITE = "SITE";

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

@ -25,15 +25,17 @@
<result column="CREATED_DATE_TIME" property="createdDateTime" />
<result column="MODIFY_USER" property="modifyUser" />
<result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
<result column="FULL_NAME" property="fullName"/>
</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.OPERATION, B.STEP_ID, B.RESRCE, B.RESULT, B.COMMENTS, B.CREATE_USER, B.CREATED_DATE_TIME, B.MODIFY_USER, B.MODIFIED_DATE_TIME,
M.ITEM, Z.DESCRIPTION ITEM_DESCRIPTION
M.ITEM, Z.DESCRIPTION ITEM_DESCRIPTION,ZNU.FULL_NAME FULL_NAME
FROM Z_INSPECTION_TASK B
INNER JOIN SFC S ON S.SITE = B.SITE AND S.SFC = B.SFC
INNER JOIN SHOP_ORDER P ON P.HANDLE = S.SHOP_ORDER_BO
INNER JOIN ITEM M ON M.HANDLE = P.ITEM_BO
LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = B.CREATE_USER
LEFT JOIN ITEM_T Z ON Z.ITEM_BO = M.HANDLE AND Z.LOCALE = 'zh'
WHERE B.SITE = #{site}
<if test="workCenter != null and workCenter != ''">

3
quality/src/main/resources/mapper/SelfReportMapper.xml
Unescape Escape View File

@ -24,6 +24,7 @@
<result column="MODIFIED_DATE_TIME" property="modifiedDateTime" />
<result column="NC_CODE_DESC" property="ncCodeDesc" />
<result column="REPORT_USER_GROUP" property="reportUserGroup" />
<result column="PB_USER" property="pbUser" />
</resultMap>
<!-- 通用查询结果列 -->
@ -559,7 +560,7 @@
</delete>
<!-- BaseMapper标准查询/修改/删除 -->
<select id="selectListByCondition" resultMap="BaseResultMap">
SELECT ZSR.HANDLE, ZSR.SITE, ZSR.TASK_NO, ZSR.WORK_CENTER,ZSR.NC_CODE_DESC, ZSR.SHOP_ORDER, ZSR.ITEM, ZSR.OP_STEP, ZSR.RESRCE, ZSR.SFC, ZSR.NC_CODE, ZSR.NC_QTY, ZSR.LOCATION, ZSR.STATE, ZSR.REMARK, B.FULL_NAME CREATE_USER,ZSR. CREATED_DATE_TIME,IT.DESCRIPTION FROM Z_SELF_REPORT ZSR
SELECT ZSR.HANDLE, ZSR.SITE, ZSR.TASK_NO, ZSR.WORK_CENTER,ZSR.NC_CODE_DESC, ZSR.SHOP_ORDER, ZSR.ITEM, ZSR.OP_STEP, ZSR.RESRCE, ZSR.SFC, ZSR.NC_CODE, ZSR.NC_QTY, ZSR.LOCATION, ZSR.STATE, ZSR.REMARK, B.FULL_NAME CREATE_USER,ZSR. CREATED_DATE_TIME,IT.DESCRIPTION,ZSR.CREATE_USER PB_USER FROM Z_SELF_REPORT ZSR
JOIN ITEM I ON I.ITEM = ZSR.ITEM AND I.CURRENT_REVISION='true'
LEFT JOIN ITEM_T IT ON I.HANDLE = IT.ITEM_BO AND IT.LOCALE = #{locale}
LEFT JOIN Z_NWA_USER B ON ZSR.SITE = B.SITE AND ZSR.CREATE_USER = B.USER_NAME

Write Preview
Loading…
Cancel
Save