|
|
@@ -708,7 +708,7 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
|
|
|
|
|
|
billQuery.setLimit(limit);
|
|
|
billQuery.setFormId("SAL_DELIVERYNOTICE");
|
|
|
- billQuery.setFieldKeys("FBillNo,FDate,FCustomerID.FName,F_QUXZ_Assistant.FNumber,FSOEntryId,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification,FMaterialId.F_QUXZ_Assistant,FUnitID.FName,FQty,FIsFree,FHGZBDay.FNumber,FStockID.FName");
|
|
|
+ billQuery.setFieldKeys("FBillNo,FDate,FCustomerID.FName,F_QUXZ_Assistant.FNumber,FEntity_FEntryID,FMaterialId.FNumber,FMaterialId.FName,FMaterialId.FSpecification,FMaterialId.F_QUXZ_Assistant,FUnitID.FName,FQty,FIsFree,FHGZBDay.FNumber,FStockID.FName");
|
|
|
List<Map> filterString = new ArrayList<>();
|
|
|
//审核日期为昨日到现在且单据状态等于已审核且明细收件人电话不为空
|
|
|
filterString.add(UtilMap.map("FieldName, Compare, Value, Left, Right, Logic","FApproveDate","265",1,"","","0"));//审核日期在今天之前XX天之后
|
|
|
@@ -771,8 +771,8 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
|
|
|
}
|
|
|
formData.put("textField_mfqhmwpu", F_QUXZ_Assistant);//销售类型
|
|
|
|
|
|
- String fsoEntryId = UtilMap.getString(map, "FSOEntryId");
|
|
|
- formData.put("textField_mfqf1fjm", fsoEntryId);//销售订单EntryId
|
|
|
+ String fEntityFEntryID = UtilMap.getString(map, "FEntity_FEntryID");
|
|
|
+ formData.put("textField_mfqf1fjm", fEntityFEntryID);//销售订单分录id
|
|
|
formData.put("textField_mfqf1fj7", UtilMap.getString(map,"FMaterialId.FNumber"));//物料编码
|
|
|
formData.put("textField_mfqf1fj8", UtilMap.getString(map,"FMaterialId.FName"));//物料名称
|
|
|
formData.put("textField_mfqf1fj9", UtilMap.getString(map,"FMaterialId.FSpecification"));//物料规格
|
|
|
@@ -800,7 +800,7 @@ public class KdHuaGaoServiceImpl implements KdHuaGaoService {
|
|
|
|
|
|
ydClient.operateData(YDParam.builder()
|
|
|
.formUuid("FORM-F7DB6FC6E47949A98BDD3DC344B3CBC1V7HY")
|
|
|
- .searchCondition(JSONObject.toJSONString(UtilMap.map("textField_mfqf1fj5, textField_mfqf1fjm",fBillNo,fsoEntryId)))
|
|
|
+ .searchCondition(JSONObject.toJSONString(UtilMap.map("textField_mfqf1fj5, textField_mfqf1fjm",fBillNo,fEntityFEntryID)))
|
|
|
.formDataJson(JSONObject.toJSONString(formData))
|
|
|
.build(), YDConf.FORM_OPERATION.upsert);
|
|
|
}
|
