|
|
@@ -62,16 +62,16 @@ public class StorageChangeStoragehouseRopServiceImpl implements StorageChangeSto
|
|
62
|
62
|
storageChangeStoragehouseDefault.setChangehouseNo(jsonObject.getString("changehouseNo")); //接收虚拟倒仓通知单编号
|
|
63
|
63
|
storageChangeStoragehouseDefault.setApplyNo(jsonObject.getString("applyNo")); //申请单号
|
|
64
|
64
|
storageChangeStoragehouseDefault.setApplyFirm(jsonObject.getString("applyFirm")); //申请倒仓企业
|
|
65
|
|
- storageChangeStoragehouseDefault.setApplyTime(jsonObject.getDate("applyTime")); //申请倒仓时间
|
|
|
65
|
+ storageChangeStoragehouseDefault.setApplyTime(jsonObject.getDate("apply_time")); //申请倒仓时间
|
|
66
|
66
|
storageChangeStoragehouseDefault.setBitWeigh("bitWeigh"); // 是否称重
|
|
67
|
67
|
storageChangeStoragehouseDefault.setCreateTime(jsonObject.getDate("createTime")); //接收时间
|
|
68
|
68
|
storageChangeStoragehouseDefault.setFoodNumber(jsonObject.getBigDecimal("foodNumber")); //粮食数量
|
|
69
|
69
|
storageChangeStoragehouseDefault.setOperStaff(jsonObject.getString("operStaff")); //操作人员
|
|
70
|
|
- storageChangeStoragehouseDefault.setOutAfter(jsonObject.getString("outAfter")); //倒出后保管方式
|
|
71
|
|
- storageChangeStoragehouseDefault.setOutBefore(jsonObject.getString("outBefore")); //倒出前保管方式
|
|
|
70
|
+ storageChangeStoragehouseDefault.setOutAfter(jsonObject.getString("out_after")); //倒出后保管方式
|
|
|
71
|
+ storageChangeStoragehouseDefault.setOutBefore(jsonObject.getString("out_before")); //倒出前保管方式
|
|
72
|
72
|
|
|
73
|
73
|
//根据倒入仓房编码查询倒入仓房、货位、组织机构数据
|
|
74
|
|
- String hwbmin = jsonObject.getString("cfbmin");
|
|
|
74
|
+ String hwbmin = jsonObject.getString("cfbmin");
|
|
75
|
75
|
Map<String, Object> inWareDataMap = feignBasicService.getWareDataByHwbm(hwbmin);
|
|
76
|
76
|
Integer houseId = (Integer) inWareDataMap.get("houseId");
|
|
77
|
77
|
Integer wareHouseId = (Integer) inWareDataMap.get("wareHouseId");
|
|
|
@@ -92,7 +92,8 @@ public class StorageChangeStoragehouseRopServiceImpl implements StorageChangeSto
|
|
92
|
92
|
storageChangeStoragehouseDefault.setOutWarehouseName(wareOutHouseName); //倒出货位名称
|
|
93
|
93
|
//根据仓房、货位、orgId获取粮食品种等信息
|
|
94
|
94
|
Map<String, Object> map = feignAgileService.getDateByChHwh(orgId, houseId, wareHouseId);
|
|
95
|
|
- String grainAttribute = (String) map.get("hwxz"); //粮油性质
|
|
|
95
|
+ Integer a = (Integer ) map.get("hwxz"); //粮油性质
|
|
|
96
|
+ String grainAttribute = a.toString();
|
|
96
|
97
|
Integer grainKind = (Integer) map.get("pz"); //品种
|
|
97
|
98
|
Integer grainDetailKind = (Integer) map.get("mxpz"); //明细品种
|
|
98
|
99
|
|
