root/hl_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rev:工单电气数量校验

Browse Source
This commit is contained in:
zhangzq
2024-05-22 14:54:40 +08:00
parent 447ce3f874
commit f3e969047d
4 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mes/hd/nladmin-system/src/main/java/org/nl/common/utils/AcsUtil.java
View File

@@ -35,14 +35,14 @@ public class AcsUtil {
result.put("data", new JSONObject()); result.put("data", new JSONObject());
return result; return result;
} }
String acsParam = "acs_url"; // String acsParam = "acs_url";
JSONObject jsonObject = list.getJSONObject(0); // JSONObject jsonObject = list.getJSONObject(0);
String acs = jsonObject.getString("acs"); // String acs = jsonObject.getString("acs");
if (StringUtils.isNotEmpty(acs)){ // if (StringUtils.isNotEmpty(acs)){
acsParam=acs; // acsParam=acs;
} // }
//ACS地址：127.0.0.1:8010 //ACS地址：127.0.0.1:8010
String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode(acsParam).getValue(); String acsUrl = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("acs_url").getValue();
String url = acsUrl + api; String url = acsUrl + api;
try { try {

7
mes/hd/nladmin-system/src/main/java/org/nl/wms/ext_manage/acs/service/impl/AcsToWmsServiceImpl.java
View File

@@ -358,14 +358,17 @@ public class AcsToWmsServiceImpl implements AcsToWmsService{
@Override @Override
@Async @Async
public void feedOrderRealQty(JSONObject param) { public void feedOrderRealQty(JSONObject param) {
String today = DateUtil.today().replace("-", "");
if (CollectionUtils.isEmpty(param)){ if (CollectionUtils.isEmpty(param)){
return; return;
} }
String today = DateUtil.format(new Date(), "yyMMdd");
String yesterday = DateUtil.format(DateUtil.yesterday(), "yyMMdd");
Iterator<String> check = param.keySet().iterator(); Iterator<String> check = param.keySet().iterator();
while (check.hasNext()){ while (check.hasNext()){
String key = check.next(); String key = check.next();
if (!key.contains(today)){ if (!key.contains(today) && !key.contains(yesterday)){
check.remove(); check.remove();
} }
} }

2
mes/hd/nladmin-system/src/main/java/org/nl/wms/product_manage/service/device/dao/mapper/PdmBiDeviceMapper.xml
View File

@@ -55,7 +55,7 @@
where where
sch_base_point.point_type = '4' and pdm_bi_device.is_used = true sch_base_point.point_type = '4' and pdm_bi_device.is_used = true
AND pdm_bi_device.is_used = true and is_artificial = false AND pdm_bi_device.is_used = true and is_artificial = false
and workprocedure_id = #{workprocedure_id} and pdm_bi_device.workprocedure_id = #{workprocedure_id}
<if test="material_id != null and material_id != ''"> <if test="material_id != null and material_id != ''">
and (pdm_bi_device.material_id = #{material_id} or pdm_bi_device.material_id is null or pdm_bi_device.material_id = '') and (pdm_bi_device.material_id = #{material_id} or pdm_bi_device.material_id is null or pdm_bi_device.material_id = '')
</if> </if>

8
mes/hd/nladmin-system/src/main/resources/logback-spring.xml
View File

@@ -80,7 +80,7 @@
<springProfile name="dev3"> <springProfile name="dev3">
<root level="info"> <root level="info">
<appender-ref ref="asyncLuceneAppender"/> <appender-ref ref="CONSOLE"/>
</root> </root>
<logger name="jdbc" level="ERROR" additivity="true"> <logger name="jdbc" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
@@ -88,9 +88,6 @@
<logger name="org.springframework" level="ERROR" additivity="true"> <logger name="org.springframework" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
</logger> </logger>
<logger name="org.nl" level="WARN" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="org.hibernate" level="ERROR" additivity="true"> <logger name="org.hibernate" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
</logger> </logger>
@@ -114,9 +111,6 @@
<root level="info"> <root level="info">
<appender-ref ref="asyncLuceneAppender"/> <appender-ref ref="asyncLuceneAppender"/>
</root> </root>
<logger name="org.nl" level="WARN" additivity="true">
<appender-ref ref="CONSOLE"/>
</logger>
<logger name="jdbc" level="ERROR" additivity="true"> <logger name="jdbc" level="ERROR" additivity="true">
<appender-ref ref="asyncFileAppender"/> <appender-ref ref="asyncFileAppender"/>
</logger> </logger>