Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
aca5bde1aa
|
|
@ -36,7 +36,7 @@ public class OtherInIotManagePlugin extends AbstractOperationServicePlugIn imple
|
||||||
for (DynamicObject dataEntity : e.getDataEntities()) {
|
for (DynamicObject dataEntity : e.getDataEntities()) {
|
||||||
String billno = dataEntity.getString("billno");
|
String billno = dataEntity.getString("billno");
|
||||||
QFilter qFilter = new QFilter("billno", QCP.equals, billno);
|
QFilter qFilter = new QFilter("billno", QCP.equals, billno);
|
||||||
DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle("im_purinbill",
|
DynamicObject dynamicObject = BusinessDataServiceHelper.loadSingle("im_otherinbill",
|
||||||
"billentry.producedate,billentry.expirydate,billentry.lotnumber,billentry.tqq9_zczh,billentry.material,billentry.warehouse,billentry.lot,billentry.qty,billentry.tqq9_goods",
|
"billentry.producedate,billentry.expirydate,billentry.lotnumber,billentry.tqq9_zczh,billentry.material,billentry.warehouse,billentry.lot,billentry.qty,billentry.tqq9_goods",
|
||||||
qFilter.toArray());
|
qFilter.toArray());
|
||||||
DynamicObjectCollection billentry = dynamicObject.getDynamicObjectCollection("billentry");
|
DynamicObjectCollection billentry = dynamicObject.getDynamicObjectCollection("billentry");
|
||||||
|
|
@ -50,7 +50,7 @@ public class OtherInIotManagePlugin extends AbstractOperationServicePlugIn imple
|
||||||
Date producedate = entry.getDate("producedate");//生产日期
|
Date producedate = entry.getDate("producedate");//生产日期
|
||||||
Date expirydate = entry.getDate("expirydate");//到期日期
|
Date expirydate = entry.getDate("expirydate");//到期日期
|
||||||
String lotnumber = entry.getString("lotnumber");//批号
|
String lotnumber = entry.getString("lotnumber");//批号
|
||||||
DynamicObject tqq9_registration = entry.getDynamicObject("tqq9_registration");//商品注册证
|
DynamicObject tqq9_registration = entry.getDynamicObject("tqq9_zczh");//商品注册证
|
||||||
DynamicObject materialpurch = entry.getDynamicObject("material");//物料采购信息
|
DynamicObject materialpurch = entry.getDynamicObject("material");//物料采购信息
|
||||||
DynamicObject masterid = materialpurch.getDynamicObject("masterid");//物料id
|
DynamicObject masterid = materialpurch.getDynamicObject("masterid");//物料id
|
||||||
DynamicObject material = materialMap.get(masterid.getLong("id"));//物料
|
DynamicObject material = materialMap.get(masterid.getLong("id"));//物料
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue