bonus
/
cqdevicemgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

仓储接收装备bug修复

This commit is contained in:
15856 2024-11-14 10:55:49 +08:00
parent 2da0d6b9c0
commit e887954bb9
3 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/app/service/impl/LeaseOutDetailsServiceImpl.java
View File

@ -143,9 +143,9 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
} }
@Override @Override
public TmTask getLeaseOutOrder(String parentId,String typeId) { public TmTask getLeaseOutOrder(String parentId, String typeId) {
TmTask orderHead = leaseApplyDetailsMapper.getOrderHead(parentId); TmTask orderHead = leaseApplyDetailsMapper.getOrderHead(parentId);
List<LeaseOutDetailRecord> list = leaseApplyDetailsMapper.getOrderBody(parentId,typeId); List<LeaseOutDetailRecord> list = leaseApplyDetailsMapper.getOrderBody(parentId, typeId);
orderHead.setLeaseOutDetailRecord(list); orderHead.setLeaseOutDetailRecord(list);
return orderHead; return orderHead;
} }
@ -254,22 +254,24 @@ public class LeaseOutDetailsServiceImpl implements LeaseOutDetailsService {
} }
// 更新 (ma_machine 设备表)的状态 // 更新 (ma_machine 设备表)的状态
leaseOutDetailsMapper.updateMaMachineStatus(record); leaseOutDetailsMapper.updateMaMachineStatus(record);
//同步租赁商城机具状态 //查询装备是否推送到租赁
try { MaMachine maMachine = maMachineMapper.selectMaMachineByMaId(Long.valueOf(record.getMaId()));
MaMachine maMachine = new MaMachine(); if (maMachine != null && maMachine.getPushStatus().equals(1)) {
maMachine.setMaId(record.getMaId()); //同步租赁商城机具状态
// 15---1在库，16---2已出库 try {
maMachine.setMaStatus("2"); // 15---1在库，16---2已出库
String content = JSONObject.toJSONString(maMachine); maMachine.setMaStatus("2");
Map<String, String> map = new HashMap<>(); String content = JSONObject.toJSONString(maMachine);
map.put("body", content); Map<String, String> map = new HashMap<>();
String body = JSONObject.toJSONString(map); map.put("body", content);
String data = HttpHelper.sendHttpPost(updateItemStatus, body); String body = JSONObject.toJSONString(map);
log.info("dataString-=========:" + data); String data = HttpHelper.sendHttpPost(updateItemStatus, body);
log.info("dataString-=========:" + data);
} catch (Exception e) { } catch (Exception e) {
log.error("同步租赁商城机具状态失败"); log.error("同步租赁商城机具状态失败");
throw new RuntimeException("同步租赁商城机具状态失败"); throw new RuntimeException("同步租赁商城机具状态失败");
} }
}
} }
} }
return res; return res;

16
sgzb-modules/sgzb-material/src/main/resources/bootstrap-sgzb_cloud_dev.yml
View File

@ -15,12 +15,14 @@ spring:
nacos: nacos:
discovery: discovery:
# 服务注册地址 # 服务注册地址
server-addr: 192.168.1.2:8848 server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev_cqjj namespace: sgzb_cloud_dev
username: nacos
password: N2$NjW2&CDEOx$mD*y5h
config: config:
# 配置中心地址 # 配置中心地址
server-addr: 192.168.1.2:8848 server-addr: 172.16.36.33:8848
namespace: sgzb_cloud_dev_cqjj namespace: sgzb_cloud_dev
# 配置文件格式 # 配置文件格式
file-extension: yml file-extension: yml
# 共享配置 # 共享配置
@ -37,8 +39,8 @@ sgzb:
job: job:
settlementJobDay: 21 settlementJobDay: 21
settlementJobCron: "0 0 1 21 * ?" settlementJobCron: "0 0 1 21 * ?"
zlptUrl: https://test-rental.zhgkxt.com/proxy/item-center/supply/item/pushNotifications zlptUrl: https://z.csgmall.com.cn/proxy/item-center/supply/item/pushNotifications
updateItemStatusUrl: https://test-rental.zhgkxt.com/proxy/item-center/supply/item/updateItemStatus updateItemStatusUrl: https://z.csgmall.com.cn/proxy/item-center/supply/item/updateItemStatus
intelligentUrl: https://www.zhgkxt.com/api/clientapi/public/externalApi intelligentUrl: https://www.zhgkxt.com/api/clientapi/public/externalApi/acceptExternalMechanical
intelligentAppKey: abc123 intelligentAppKey: abc123
intelligentAesKey: abcdefghijklmnop intelligentAesKey: abcdefghijklmnop

2
sgzb-modules/sgzb-material/src/main/resources/mapper/base/MaMachineMapper.xml
View File

@ -290,7 +290,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, m.qr_code, m.buy_price, m.ma_vender, m.out_fac_time, m.out_fac_code, select m.ma_id, m.type_id, m.ma_code, m.pre_code, m.ma_status, m.qr_code, m.buy_price, m.ma_vender, m.out_fac_time, m.out_fac_code,
m.assets_code, m.check_man, m.this_check_time, m.next_check_time, m.gps_code, m.rfid_code, m.erp_code, m.transfer_code, m.assets_code, m.check_man, m.this_check_time, m.next_check_time, m.gps_code, m.rfid_code, m.erp_code, m.transfer_code,
m.in_out_num, m.buy_task, m.own_house ,m.company_id ,mt.type_name specificationType,mt1.type_name deviceType, mt2.type_name itemType, m.in_out_num, m.buy_task, m.own_house ,m.company_id ,mt.type_name specificationType,mt1.type_name deviceType, mt2.type_name itemType,
dic.name maStatusName ,mhi.house_name ownHouseName,mps.prop_id propId, msi.supplier,msi.supplier_id supplierId dic.name maStatusName ,mhi.house_name ownHouseName,mps.prop_id propId, msi.supplier,msi.supplier_id supplierId,m.push_status
from ma_machine m from ma_machine m
left join ma_type mt on m.type_id = mt.type_id left join ma_type mt on m.type_id = mt.type_id
left join ma_type mt1 on mt.parent_id = mt1.type_id left join ma_type mt1 on mt.parent_id = mt1.type_id