|
|
@@ -379,8 +379,10 @@ public class DocumentToObjectUtils {
|
|
|
saleSend.setEnterprise(JSONObject.parseObject(
|
|
|
document.get(ClassAndTableNameUtils.combineField(tableName, SaleSendSimpleInfo.ENTERPRISE_FIELD)),
|
|
|
EnterpriseSimpleInfo.class));
|
|
|
- saleSend.setVerifystatus(Short.valueOf(
|
|
|
- document.get(ClassAndTableNameUtils.combineField(tableName, SaleSendSimpleInfo.STATUS_FIELD))));
|
|
|
+ if (document.get(SaleSendSimpleInfo.STATUS_FIELD) != null) {
|
|
|
+ saleSend.setVerifystatus(Short.valueOf(
|
|
|
+ document.get(ClassAndTableNameUtils.combineField(tableName, SaleSendSimpleInfo.STATUS_FIELD))));
|
|
|
+ }
|
|
|
saleSend.setVend(JSONObject.parseObject(
|
|
|
document.get(ClassAndTableNameUtils.combineField(tableName, SaleSendSimpleInfo.VEND_FIELD)),
|
|
|
EnterpriseSimpleInfo.class));
|
|
|
@@ -441,8 +443,9 @@ public class DocumentToObjectUtils {
|
|
|
makeChangeItem.setVend(JSONObject.parseObject(
|
|
|
document.get(ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.VEND_FIELD)),
|
|
|
EnterpriseSimpleInfo.class));
|
|
|
- makeChangeItem.setProduct(JSONObject.parseObject(document.get(
|
|
|
- ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.PRODUCT_FIELD)),
|
|
|
+ makeChangeItem.setProduct(JSONObject.parseObject(
|
|
|
+ document.get(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.PRODUCT_FIELD)),
|
|
|
ProductSimpleInfo.class));
|
|
|
makeChangeItem.setMakeChanges(JSONObject.parseObject(
|
|
|
document.get(ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.MAKE_FIELD)),
|