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
赵嘉伟 4 years ago
parent a2f9e5ffb8 64da93ed43
commit 99d8d9a3e5
8 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File

2
common/src/main/java/com/foreverwin/mesnac/common/erp/ZWS_ZMES_PRODORDCONF_ServiceLocator.java
Unescape Escape View File

@ -22,7 +22,7 @@ public class ZWS_ZMES_PRODORDCONF_ServiceLocator extends org.apache.axis.client.
}
// Use to get a proxy class for ZWS_ZMES_PRODORDCONF
private java.lang.String ZWS_ZMES_PRODORDCONF_address = "http://sapdev.mesnac.com:8000/sap/bc/srt/rfc/sap/zws_zmes_prodordconf/302/zws_zmes_prodordconf/zws_zmes_prodordconf";
private java.lang.String ZWS_ZMES_PRODORDCONF_address = "http://srm.mesnac.com:8000/sap/bc/srt/rfc/sap/zws_zmes_prodordconf/900/zws_zmes_prodordconf/zws_zmes_prodordconf";
public java.lang.String getZWS_ZMES_PRODORDCONFAddress() {
return ZWS_ZMES_PRODORDCONF_address;

2
common/src/main/java/com/foreverwin/mesnac/common/util/ERPAPI.java
Unescape Escape View File

@ -26,7 +26,7 @@ public class ERPAPI {
String server = System.getProperty("ws.erp.server");
String port = System.getProperty("ws.erp.port");
return String.format("http://%s:%s/sap/bc/srt/rfc/sap/zws_zmes_prodordconf/302/zws_zmes_prodordconf/zws_zmes_prodordconf", server, port);
return String.format("http://%s:%s/sap/bc/srt/rfc/sap/zws_zmes_prodordconf/900/zws_zmes_prodordconf/zws_zmes_prodordconf", server, port);
}
public static void apply(Object stubImpl) {

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>

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>

Write Preview
Loading…
Cancel
Save