1.WMS上海出库入库接口extendProps处理
This commit is contained in:
parent
b55a46a8c2
commit
961e8862a9
|
|
@ -571,10 +571,25 @@ public class WMSPurInController {
|
||||||
Date productDate = orderLine.getDate("productDate");//生产日期
|
Date productDate = orderLine.getDate("productDate");//生产日期
|
||||||
Date expireDate = orderLine.getDate("expireDate");//失效期
|
Date expireDate = orderLine.getDate("expireDate");//失效期
|
||||||
String batchCode = orderLine.getString("batchCode");//批次
|
String batchCode = orderLine.getString("batchCode");//批次
|
||||||
|
String key1 = null;//注册证号
|
||||||
|
String key3 = null;//生产许可证
|
||||||
|
String key2 = null;//生产厂商
|
||||||
|
if (orderLine.get("extendProps") instanceof Map) {
|
||||||
JSONObject extendProps = orderLine.getJSONObject("extendProps");//批次信息
|
JSONObject extendProps = orderLine.getJSONObject("extendProps");//批次信息
|
||||||
String key1 = extendProps.getString("key1");//注册证号
|
key1 = extendProps.getString("key1");//注册证号
|
||||||
String key3 = extendProps.getString("key3");//生产许可证
|
key3 = extendProps.getString("key3");//生产许可证
|
||||||
String key2 = extendProps.getString("key2");//生产厂商
|
key2 = extendProps.getString("key2");//生产厂商
|
||||||
|
}else{
|
||||||
|
JSONArray extendProps = orderLine.getJSONArray("extendProps");
|
||||||
|
for (Object o : extendProps) {
|
||||||
|
JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
|
||||||
|
if(extendProp.getString("key1")!=null){
|
||||||
|
key1 = extendProp.getString("key1");//注册证号
|
||||||
|
key3 = extendProp.getString("key3");//生产许可证
|
||||||
|
key2 = extendProp.getString("key2");//生产厂商
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
detailObject.put("entryId", orderLineNo);
|
detailObject.put("entryId", orderLineNo);
|
||||||
detailObject.put("uniqueCode", itemCode);
|
detailObject.put("uniqueCode", itemCode);
|
||||||
detailObject.put("quantity", actualQty);
|
detailObject.put("quantity", actualQty);
|
||||||
|
|
@ -599,10 +614,25 @@ public class WMSPurInController {
|
||||||
Date productDate = orderLine1.getDate("productDate");//生产日期
|
Date productDate = orderLine1.getDate("productDate");//生产日期
|
||||||
Date expireDate = orderLine1.getDate("expireDate");//失效期
|
Date expireDate = orderLine1.getDate("expireDate");//失效期
|
||||||
String batchCode = orderLine1.getString("batchCode");//批次
|
String batchCode = orderLine1.getString("batchCode");//批次
|
||||||
|
String key1 = null;//注册证号
|
||||||
|
String key3 = null;//生产许可证
|
||||||
|
String key2 = null;//生产厂商
|
||||||
|
if (orderLine1.get("extendProps") instanceof Map) {
|
||||||
JSONObject extendProps = orderLine1.getJSONObject("extendProps");//批次信息
|
JSONObject extendProps = orderLine1.getJSONObject("extendProps");//批次信息
|
||||||
String key1 = extendProps.getString("key1");//注册证号
|
key1 = extendProps.getString("key1");//注册证号
|
||||||
String key3 = extendProps.getString("key3");//生产许可证
|
key3 = extendProps.getString("key3");//生产许可证
|
||||||
String key2 = extendProps.getString("key2");//生产厂商
|
key2 = extendProps.getString("key2");//生产厂商
|
||||||
|
}else{
|
||||||
|
JSONArray extendProps = orderLine1.getJSONArray("extendProps");
|
||||||
|
for (Object o : extendProps) {
|
||||||
|
JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
|
||||||
|
if(extendProp.getString("key1")!=null){
|
||||||
|
key1 = extendProp.getString("key1");//注册证号
|
||||||
|
key3 = extendProp.getString("key3");//生产许可证
|
||||||
|
key2 = extendProp.getString("key2");//生产厂商
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
detailObject.put("entryId", orderLineNo);
|
detailObject.put("entryId", orderLineNo);
|
||||||
detailObject.put("uniqueCode", itemCode);
|
detailObject.put("uniqueCode", itemCode);
|
||||||
detailObject.put("quantity", actualQty);
|
detailObject.put("quantity", actualQty);
|
||||||
|
|
@ -706,10 +736,25 @@ public class WMSPurInController {
|
||||||
Date productDate = orderLine.getDate("productDate");//生产日期
|
Date productDate = orderLine.getDate("productDate");//生产日期
|
||||||
Date expireDate = orderLine.getDate("expireDate");//失效期
|
Date expireDate = orderLine.getDate("expireDate");//失效期
|
||||||
String batchCode = orderLine.getString("batchCode");//批次
|
String batchCode = orderLine.getString("batchCode");//批次
|
||||||
|
String key1 = null;//注册证号
|
||||||
|
String key3 = null;//生产许可证
|
||||||
|
String key2 = null;//生产厂商
|
||||||
|
if (orderLine.get("extendProps") instanceof Map) {
|
||||||
JSONObject extendProps = orderLine.getJSONObject("extendProps");//批次信息
|
JSONObject extendProps = orderLine.getJSONObject("extendProps");//批次信息
|
||||||
String key1 = extendProps.getString("key1");//注册证号
|
key1 = extendProps.getString("key1");//注册证号
|
||||||
String key3 = extendProps.getString("key3");//生产许可证
|
key3 = extendProps.getString("key3");//生产许可证
|
||||||
String key2 = extendProps.getString("key2");//生产厂商
|
key2 = extendProps.getString("key2");//生产厂商
|
||||||
|
}else{
|
||||||
|
JSONArray extendProps = orderLine.getJSONArray("extendProps");
|
||||||
|
for (Object o : extendProps) {
|
||||||
|
JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
|
||||||
|
if(extendProp.getString("key1")!=null){
|
||||||
|
key1 = extendProp.getString("key1");//注册证号
|
||||||
|
key3 = extendProp.getString("key3");//生产许可证
|
||||||
|
key2 = extendProp.getString("key2");//生产厂商
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
detailObject.put("entryId", orderLineNo);
|
detailObject.put("entryId", orderLineNo);
|
||||||
detailObject.put("uniqueCode", itemCode);
|
detailObject.put("uniqueCode", itemCode);
|
||||||
detailObject.put("quantity", actualQty);
|
detailObject.put("quantity", actualQty);
|
||||||
|
|
@ -734,10 +779,25 @@ public class WMSPurInController {
|
||||||
Date productDate = orderLine1.getDate("productDate");//生产日期
|
Date productDate = orderLine1.getDate("productDate");//生产日期
|
||||||
Date expireDate = orderLine1.getDate("expireDate");//失效期
|
Date expireDate = orderLine1.getDate("expireDate");//失效期
|
||||||
String batchCode = orderLine1.getString("batchCode");//批次
|
String batchCode = orderLine1.getString("batchCode");//批次
|
||||||
|
String key1 = null;//注册证号
|
||||||
|
String key3 = null;//生产许可证
|
||||||
|
String key2 = null;//生产厂商
|
||||||
|
if (orderLine1.get("extendProps") instanceof Map) {
|
||||||
JSONObject extendProps = orderLine1.getJSONObject("extendProps");//批次信息
|
JSONObject extendProps = orderLine1.getJSONObject("extendProps");//批次信息
|
||||||
String key1 = extendProps.getString("key1");//注册证号
|
key1 = extendProps.getString("key1");//注册证号
|
||||||
String key3 = extendProps.getString("key3");//生产许可证
|
key3 = extendProps.getString("key3");//生产许可证
|
||||||
String key2 = extendProps.getString("key2");//生产厂商
|
key2 = extendProps.getString("key2");//生产厂商
|
||||||
|
}else{
|
||||||
|
JSONArray extendProps = orderLine1.getJSONArray("extendProps");
|
||||||
|
for (Object o : extendProps) {
|
||||||
|
JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
|
||||||
|
if(extendProp.getString("key1")!=null){
|
||||||
|
key1 = extendProp.getString("key1");//注册证号
|
||||||
|
key3 = extendProp.getString("key3");//生产许可证
|
||||||
|
key2 = extendProp.getString("key2");//生产厂商
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
detailObject.put("entryId", orderLineNo);
|
detailObject.put("entryId", orderLineNo);
|
||||||
detailObject.put("uniqueCode", itemCode);
|
detailObject.put("uniqueCode", itemCode);
|
||||||
detailObject.put("quantity", actualQty);
|
detailObject.put("quantity", actualQty);
|
||||||
|
|
@ -844,10 +904,25 @@ public class WMSPurInController {
|
||||||
Date productDate = orderLine.getDate("productDate");//生产日期
|
Date productDate = orderLine.getDate("productDate");//生产日期
|
||||||
Date expireDate = orderLine.getDate("expireDate");//失效期
|
Date expireDate = orderLine.getDate("expireDate");//失效期
|
||||||
String batchCode = orderLine.getString("batchCode");//批次
|
String batchCode = orderLine.getString("batchCode");//批次
|
||||||
|
String key1 = null;//注册证号
|
||||||
|
String key3 = null;//生产许可证
|
||||||
|
String key2 = null;//生产厂商
|
||||||
|
if (orderLine.get("extendProps") instanceof Map) {
|
||||||
JSONObject extendProps = orderLine.getJSONObject("extendProps");//批次信息
|
JSONObject extendProps = orderLine.getJSONObject("extendProps");//批次信息
|
||||||
String key1 = extendProps.getString("key1");//注册证号
|
key1 = extendProps.getString("key1");//注册证号
|
||||||
String key3 = extendProps.getString("key3");//生产许可证
|
key3 = extendProps.getString("key3");//生产许可证
|
||||||
String key2 = extendProps.getString("key2");//生产厂商
|
key2 = extendProps.getString("key2");//生产厂商
|
||||||
|
}else{
|
||||||
|
JSONArray extendProps = orderLine.getJSONArray("extendProps");
|
||||||
|
for (Object o : extendProps) {
|
||||||
|
JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
|
||||||
|
if(extendProp.getString("key1")!=null){
|
||||||
|
key1 = extendProp.getString("key1");//注册证号
|
||||||
|
key3 = extendProp.getString("key3");//生产许可证
|
||||||
|
key2 = extendProp.getString("key2");//生产厂商
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
detailObject.put("entryId", orderLineNo);
|
detailObject.put("entryId", orderLineNo);
|
||||||
detailObject.put("uniqueCode", itemCode);
|
detailObject.put("uniqueCode", itemCode);
|
||||||
detailObject.put("quantity", actualQty);
|
detailObject.put("quantity", actualQty);
|
||||||
|
|
@ -872,10 +947,25 @@ public class WMSPurInController {
|
||||||
Date productDate = orderLine1.getDate("productDate");//生产日期
|
Date productDate = orderLine1.getDate("productDate");//生产日期
|
||||||
Date expireDate = orderLine1.getDate("expireDate");//失效期
|
Date expireDate = orderLine1.getDate("expireDate");//失效期
|
||||||
String batchCode = orderLine1.getString("batchCode");//批次
|
String batchCode = orderLine1.getString("batchCode");//批次
|
||||||
|
String key1 = null;//注册证号
|
||||||
|
String key3 = null;//生产许可证
|
||||||
|
String key2 = null;//生产厂商
|
||||||
|
if (orderLine1.get("extendProps") instanceof Map) {
|
||||||
JSONObject extendProps = orderLine1.getJSONObject("extendProps");//批次信息
|
JSONObject extendProps = orderLine1.getJSONObject("extendProps");//批次信息
|
||||||
String key1 = extendProps.getString("key1");//注册证号
|
key1 = extendProps.getString("key1");//注册证号
|
||||||
String key3 = extendProps.getString("key3");//生产许可证
|
key3 = extendProps.getString("key3");//生产许可证
|
||||||
String key2 = extendProps.getString("key2");//生产厂商
|
key2 = extendProps.getString("key2");//生产厂商
|
||||||
|
}else{
|
||||||
|
JSONArray extendProps = orderLine1.getJSONArray("extendProps");
|
||||||
|
for (Object o : extendProps) {
|
||||||
|
JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
|
||||||
|
if(extendProp.getString("key1")!=null){
|
||||||
|
key1 = extendProp.getString("key1");//注册证号
|
||||||
|
key3 = extendProp.getString("key3");//生产许可证
|
||||||
|
key2 = extendProp.getString("key2");//生产厂商
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
detailObject.put("entryId", orderLineNo);
|
detailObject.put("entryId", orderLineNo);
|
||||||
detailObject.put("uniqueCode", itemCode);
|
detailObject.put("uniqueCode", itemCode);
|
||||||
detailObject.put("quantity", actualQty);
|
detailObject.put("quantity", actualQty);
|
||||||
|
|
|
||||||
|
|
@ -570,10 +570,25 @@ public class WMSSaleOutController {
|
||||||
Date productDate = orderLine.getDate("productDate");//生产日期
|
Date productDate = orderLine.getDate("productDate");//生产日期
|
||||||
Date expireDate = orderLine.getDate("expireDate");//失效期
|
Date expireDate = orderLine.getDate("expireDate");//失效期
|
||||||
String batchCode = orderLine.getString("batchCode");//批次
|
String batchCode = orderLine.getString("batchCode");//批次
|
||||||
|
String key1 = null;//注册证号
|
||||||
|
String key3 = null;//生产许可证
|
||||||
|
String key2 = null;//生产厂商
|
||||||
|
if (orderLine.get("extendProps") instanceof Map) {
|
||||||
JSONObject extendProps = orderLine.getJSONObject("extendProps");//批次信息
|
JSONObject extendProps = orderLine.getJSONObject("extendProps");//批次信息
|
||||||
String key1 = extendProps.getString("key1");//注册证号
|
key1 = extendProps.getString("key1");//注册证号
|
||||||
String key3 = extendProps.getString("key3");//生产许可证
|
key3 = extendProps.getString("key3");//生产许可证
|
||||||
String key2 = extendProps.getString("key2");//生产厂商
|
key2 = extendProps.getString("key2");//生产厂商
|
||||||
|
}else{
|
||||||
|
JSONArray extendProps = orderLine.getJSONArray("extendProps");
|
||||||
|
for (Object o : extendProps) {
|
||||||
|
JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
|
||||||
|
if(extendProp.getString("key1")!=null){
|
||||||
|
key1 = extendProp.getString("key1");//注册证号
|
||||||
|
key3 = extendProp.getString("key3");//生产许可证
|
||||||
|
key2 = extendProp.getString("key2");//生产厂商
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
detailObject.put("entryId", orderLineNo);
|
detailObject.put("entryId", orderLineNo);
|
||||||
detailObject.put("uniqueCode", itemCode);
|
detailObject.put("uniqueCode", itemCode);
|
||||||
detailObject.put("quantity", actualQty);
|
detailObject.put("quantity", actualQty);
|
||||||
|
|
@ -598,10 +613,25 @@ public class WMSSaleOutController {
|
||||||
Date productDate = orderLine1.getDate("productDate");//生产日期
|
Date productDate = orderLine1.getDate("productDate");//生产日期
|
||||||
Date expireDate = orderLine1.getDate("expireDate");//失效期
|
Date expireDate = orderLine1.getDate("expireDate");//失效期
|
||||||
String batchCode = orderLine1.getString("batchCode");//批次
|
String batchCode = orderLine1.getString("batchCode");//批次
|
||||||
|
String key1 = null;//注册证号
|
||||||
|
String key3 = null;//生产许可证
|
||||||
|
String key2 = null;//生产厂商
|
||||||
|
if (orderLine1.get("extendProps") instanceof Map) {
|
||||||
JSONObject extendProps = orderLine1.getJSONObject("extendProps");//批次信息
|
JSONObject extendProps = orderLine1.getJSONObject("extendProps");//批次信息
|
||||||
String key1 = extendProps.getString("key1");//注册证号
|
key1 = extendProps.getString("key1");//注册证号
|
||||||
String key3 = extendProps.getString("key3");//生产许可证
|
key3 = extendProps.getString("key3");//生产许可证
|
||||||
String key2 = extendProps.getString("key2");//生产厂商
|
key2 = extendProps.getString("key2");//生产厂商
|
||||||
|
}else{
|
||||||
|
JSONArray extendProps = orderLine1.getJSONArray("extendProps");
|
||||||
|
for (Object o : extendProps) {
|
||||||
|
JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
|
||||||
|
if(extendProp.getString("key1")!=null){
|
||||||
|
key1 = extendProp.getString("key1");//注册证号
|
||||||
|
key3 = extendProp.getString("key3");//生产许可证
|
||||||
|
key2 = extendProp.getString("key2");//生产厂商
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
detailObject.put("entryId", orderLineNo);
|
detailObject.put("entryId", orderLineNo);
|
||||||
detailObject.put("uniqueCode", itemCode);
|
detailObject.put("uniqueCode", itemCode);
|
||||||
detailObject.put("quantity", actualQty);
|
detailObject.put("quantity", actualQty);
|
||||||
|
|
@ -705,10 +735,25 @@ public class WMSSaleOutController {
|
||||||
Date productDate = orderLine.getDate("productDate");//生产日期
|
Date productDate = orderLine.getDate("productDate");//生产日期
|
||||||
Date expireDate = orderLine.getDate("expireDate");//失效期
|
Date expireDate = orderLine.getDate("expireDate");//失效期
|
||||||
String batchCode = orderLine.getString("batchCode");//批次
|
String batchCode = orderLine.getString("batchCode");//批次
|
||||||
|
String key1 = null;//注册证号
|
||||||
|
String key3 = null;//生产许可证
|
||||||
|
String key2 = null;//生产厂商
|
||||||
|
if (orderLine.get("extendProps") instanceof Map) {
|
||||||
JSONObject extendProps = orderLine.getJSONObject("extendProps");//批次信息
|
JSONObject extendProps = orderLine.getJSONObject("extendProps");//批次信息
|
||||||
String key1 = extendProps.getString("key1");//注册证号
|
key1 = extendProps.getString("key1");//注册证号
|
||||||
String key3 = extendProps.getString("key3");//生产许可证
|
key3 = extendProps.getString("key3");//生产许可证
|
||||||
String key2 = extendProps.getString("key2");//生产厂商
|
key2 = extendProps.getString("key2");//生产厂商
|
||||||
|
}else{
|
||||||
|
JSONArray extendProps = orderLine.getJSONArray("extendProps");
|
||||||
|
for (Object o : extendProps) {
|
||||||
|
JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
|
||||||
|
if(extendProp.getString("key1")!=null){
|
||||||
|
key1 = extendProp.getString("key1");//注册证号
|
||||||
|
key3 = extendProp.getString("key3");//生产许可证
|
||||||
|
key2 = extendProp.getString("key2");//生产厂商
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
detailObject.put("entryId", orderLineNo);
|
detailObject.put("entryId", orderLineNo);
|
||||||
detailObject.put("uniqueCode", itemCode);
|
detailObject.put("uniqueCode", itemCode);
|
||||||
detailObject.put("quantity", actualQty);
|
detailObject.put("quantity", actualQty);
|
||||||
|
|
@ -733,10 +778,25 @@ public class WMSSaleOutController {
|
||||||
Date productDate = orderLine1.getDate("productDate");//生产日期
|
Date productDate = orderLine1.getDate("productDate");//生产日期
|
||||||
Date expireDate = orderLine1.getDate("expireDate");//失效期
|
Date expireDate = orderLine1.getDate("expireDate");//失效期
|
||||||
String batchCode = orderLine1.getString("batchCode");//批次
|
String batchCode = orderLine1.getString("batchCode");//批次
|
||||||
|
String key1 = null;//注册证号
|
||||||
|
String key3 = null;//生产许可证
|
||||||
|
String key2 = null;//生产厂商
|
||||||
|
if (orderLine1.get("extendProps") instanceof Map) {
|
||||||
JSONObject extendProps = orderLine1.getJSONObject("extendProps");//批次信息
|
JSONObject extendProps = orderLine1.getJSONObject("extendProps");//批次信息
|
||||||
String key1 = extendProps.getString("key1");//注册证号
|
key1 = extendProps.getString("key1");//注册证号
|
||||||
String key3 = extendProps.getString("key3");//生产许可证
|
key3 = extendProps.getString("key3");//生产许可证
|
||||||
String key2 = extendProps.getString("key2");//生产厂商
|
key2 = extendProps.getString("key2");//生产厂商
|
||||||
|
}else{
|
||||||
|
JSONArray extendProps = orderLine1.getJSONArray("extendProps");
|
||||||
|
for (Object o : extendProps) {
|
||||||
|
JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
|
||||||
|
if(extendProp.getString("key1")!=null){
|
||||||
|
key1 = extendProp.getString("key1");//注册证号
|
||||||
|
key3 = extendProp.getString("key3");//生产许可证
|
||||||
|
key2 = extendProp.getString("key2");//生产厂商
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
detailObject.put("entryId", orderLineNo);
|
detailObject.put("entryId", orderLineNo);
|
||||||
detailObject.put("uniqueCode", itemCode);
|
detailObject.put("uniqueCode", itemCode);
|
||||||
detailObject.put("quantity", actualQty);
|
detailObject.put("quantity", actualQty);
|
||||||
|
|
@ -854,10 +914,25 @@ public class WMSSaleOutController {
|
||||||
Date productDate = orderLine.getDate("productDate");//生产日期
|
Date productDate = orderLine.getDate("productDate");//生产日期
|
||||||
Date expireDate = orderLine.getDate("expireDate");//失效期
|
Date expireDate = orderLine.getDate("expireDate");//失效期
|
||||||
String batchCode = orderLine.getString("batchCode");//批次
|
String batchCode = orderLine.getString("batchCode");//批次
|
||||||
|
String key1 = null;//注册证号
|
||||||
|
String key3 = null;//生产许可证
|
||||||
|
String key2 = null;//生产厂商
|
||||||
|
if (orderLine.get("extendProps") instanceof Map) {
|
||||||
JSONObject extendProps = orderLine.getJSONObject("extendProps");//批次信息
|
JSONObject extendProps = orderLine.getJSONObject("extendProps");//批次信息
|
||||||
String key1 = extendProps.getString("key1");//注册证号
|
key1 = extendProps.getString("key1");//注册证号
|
||||||
String key3 = extendProps.getString("key3");//生产许可证
|
key3 = extendProps.getString("key3");//生产许可证
|
||||||
String key2 = extendProps.getString("key2");//生产厂商
|
key2 = extendProps.getString("key2");//生产厂商
|
||||||
|
}else{
|
||||||
|
JSONArray extendProps = orderLine.getJSONArray("extendProps");
|
||||||
|
for (Object o : extendProps) {
|
||||||
|
JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
|
||||||
|
if(extendProp.getString("key1")!=null){
|
||||||
|
key1 = extendProp.getString("key1");//注册证号
|
||||||
|
key3 = extendProp.getString("key3");//生产许可证
|
||||||
|
key2 = extendProp.getString("key2");//生产厂商
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
detailObject.put("entryId", orderLineNo);
|
detailObject.put("entryId", orderLineNo);
|
||||||
detailObject.put("uniqueCode", itemCode);
|
detailObject.put("uniqueCode", itemCode);
|
||||||
detailObject.put("quantity", actualQty);
|
detailObject.put("quantity", actualQty);
|
||||||
|
|
@ -882,10 +957,25 @@ public class WMSSaleOutController {
|
||||||
Date productDate = orderLine1.getDate("productDate");//生产日期
|
Date productDate = orderLine1.getDate("productDate");//生产日期
|
||||||
Date expireDate = orderLine1.getDate("expireDate");//失效期
|
Date expireDate = orderLine1.getDate("expireDate");//失效期
|
||||||
String batchCode = orderLine1.getString("batchCode");//批次
|
String batchCode = orderLine1.getString("batchCode");//批次
|
||||||
|
String key1 = null;//注册证号
|
||||||
|
String key3 = null;//生产许可证
|
||||||
|
String key2 = null;//生产厂商
|
||||||
|
if (orderLine1.get("extendProps") instanceof Map) {
|
||||||
JSONObject extendProps = orderLine1.getJSONObject("extendProps");//批次信息
|
JSONObject extendProps = orderLine1.getJSONObject("extendProps");//批次信息
|
||||||
String key1 = extendProps.getString("key1");//注册证号
|
key1 = extendProps.getString("key1");//注册证号
|
||||||
String key3 = extendProps.getString("key3");//生产许可证
|
key3 = extendProps.getString("key3");//生产许可证
|
||||||
String key2 = extendProps.getString("key2");//生产厂商
|
key2 = extendProps.getString("key2");//生产厂商
|
||||||
|
}else{
|
||||||
|
JSONArray extendProps = orderLine1.getJSONArray("extendProps");
|
||||||
|
for (Object o : extendProps) {
|
||||||
|
JSONObject extendProp = gson.fromJson(gson.toJson(o), JSONObject.class);
|
||||||
|
if(extendProp.getString("key1")!=null){
|
||||||
|
key1 = extendProp.getString("key1");//注册证号
|
||||||
|
key3 = extendProp.getString("key3");//生产许可证
|
||||||
|
key2 = extendProp.getString("key2");//生产厂商
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
detailObject.put("entryId", orderLineNo);
|
detailObject.put("entryId", orderLineNo);
|
||||||
detailObject.put("uniqueCode", itemCode);
|
detailObject.put("uniqueCode", itemCode);
|
||||||
detailObject.put("quantity", actualQty);
|
detailObject.put("quantity", actualQty);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue