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

fix:新增定时器

Browse Source
This commit is contained in:
zhouz
2025-11-03 10:57:06 +08:00
parent ab42116bc7
commit 0f256d3cbe
5 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/rest/LmsToMesController.java
View File

@@ -158,6 +158,7 @@ public class LmsToMesController {
@Log("LMS获取MES称重后子卷信息") @Log("LMS获取MES称重后子卷信息")
@SaIgnore @SaIgnore
public ResponseEntity<Object> EditSheetApi(@RequestBody JSONObject jo) { public ResponseEntity<Object> EditSheetApi(@RequestBody JSONObject jo) {
return new ResponseEntity<>(lmsToMesService.EditSheetApi(jo), HttpStatus.OK); lmsToMesService.EditSheetApi(jo);
return new ResponseEntity<>(HttpStatus.OK);
} }
} }

2
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/LmsToMesService.java
View File

@@ -187,5 +187,5 @@ public interface LmsToMesService {
JSONObject getInspectionResult(JSONObject jo); JSONObject getInspectionResult(JSONObject jo);
JSONObject EditSheetApi(JSONObject jo); void EditSheetApi(JSONObject jo);
} }

22
lms/nladmin-system/src/main/java/org/nl/wms/ext/mes/service/impl/LmsToMesServiceImpl.java
View File

@@ -1230,7 +1230,7 @@ public class LmsToMesServiceImpl implements LmsToMesService {
} }
@Override @Override
public JSONObject EditSheetApi(JSONObject jo) { public void EditSheetApi(JSONObject jo) {
JSONObject feishu_json = new JSONObject(); JSONObject feishu_json = new JSONObject();
feishu_json.put("app_token", "B6r1bVaHmak3xQsL8kMc9gM5nxf"); feishu_json.put("app_token", "B6r1bVaHmak3xQsL8kMc9gM5nxf");
feishu_json.put("tableid", "tbluPCwWQcvOprcx"); feishu_json.put("tableid", "tbluPCwWQcvOprcx");
@@ -1247,10 +1247,8 @@ public class LmsToMesServiceImpl implements LmsToMesService {
// 2. 前一天早上 8 点：当天 8 点减去 1 天 // 2. 前一天早上 8 点：当天 8 点减去 1 天
LocalDateTime yesterday8AM = today8AM.minus(1, ChronoUnit.DAYS).plusSeconds(1); LocalDateTime yesterday8AM = today8AM.minus(1, ChronoUnit.DAYS).plusSeconds(1);
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
//String begin_time = yesterday8AM.format(formatter); String begin_time = yesterday8AM.format(formatter);
String begin_time = "2025-06-24 08:00:00"; String end_time = today8AM.format(formatter);
//String end_time = today8AM.format(formatter);
String end_time = "2025-06-25 07:59:59";
JSONArray rows = WQL.getWO("ST_IVT_INBILLQUERY").addParam("flag", "7") JSONArray rows = WQL.getWO("ST_IVT_INBILLQUERY").addParam("flag", "7")
.addParam("begin_time", begin_time) .addParam("begin_time", begin_time)
.addParam("end_time", end_time) .addParam("end_time", end_time)
@@ -1296,7 +1294,17 @@ public class LmsToMesServiceImpl implements LmsToMesService {
fs_rows.add(fs_row); fs_rows.add(fs_row);
} }
feishu_json.put("MsgList", fs_rows); feishu_json.put("MsgList", fs_rows);
log.info(feishu_json.toString());
return null; try {
String url = SpringContextHolder.getBean(SysParamServiceImpl.class).findByCode("FEISHU_INSTOR").getValue();
String api = "FeiShuNoticesWebApi/EditSheetApi";
String resultMsg = HttpRequest.post(url+api)
.body(String.valueOf(feishu_json))
.execute().body();
log.info("飞书输入参数为：-------------------" + feishu_json);
log.info("飞书输出参数为：-------------------" + resultMsg);
} catch (Exception e) {
log.info(e.getMessage());
}
} }
} }

4
lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql
View File

@@ -1368,8 +1368,8 @@
LEFT JOIN st_ivt_iostorinv b ON a.iostorinv_id = b.iostorinv_id LEFT JOIN st_ivt_iostorinv b ON a.iostorinv_id = b.iostorinv_id
WHERE b.io_type = '0' WHERE b.io_type = '0'
AND b.bill_type = '0001' AND b.bill_type = '0001'
AND b.confirm_time >= '2025-06-24 08:00:00' AND b.confirm_time >= 输入.begin_time
AND b.confirm_time <= '2025-06-25 07:59:59' AND b.confirm_time <= 输入.end_time
AND b.bill_status = '99' AND b.bill_status = '99'
GROUP BY pcsn GROUP BY pcsn
UNION UNION

1
lms/nladmin-ui/src/views/wms/pdm/bi/index.vue
View File

@@ -588,7 +588,6 @@
/> />
<el-table-column <el-table-column
prop="width_standard" prop="width_standard"
:formatter="crud.formatNum0"
label="客户要求幅宽" label="客户要求幅宽"
:min-width="flexWidth('width_standard',crud.data,'客户要求幅宽')" :min-width="flexWidth('width_standard',crud.data,'客户要求幅宽')"
/> />