gongdoudou
/
lc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sez 2025-11-03 18:25:50 +08:00
parent da22658efc 8a91e8e85d
commit c5eda04de4
4 changed files with 87 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lc123/cloud/app/eip/iscb/impl/LCLogServiceImpl.java
View File

@ -7,9 +7,12 @@ import kd.bos.entity.operate.result.IOperateInfo;
import kd.bos.entity.operate.result.OperationResult;
import kd.bos.logging.Log;
import kd.bos.logging.LogFactory;
import kd.bos.orm.query.QCP;
import kd.bos.orm.query.QFilter;
import kd.bos.servicehelper.BusinessDataServiceHelper;
import kd.bos.servicehelper.coderule.CodeRuleServiceHelper;
import kd.bos.servicehelper.operation.OperationServiceHelper;
import kd.bos.servicehelper.user.UserServiceHelper;
import tqq9.lc123.cloud.app.eip.iscb.LCLogService;
import java.util.Date;
@ -54,7 +57,9 @@ import java.util.List;
// 获取根据编码规则得到的编码字符串
String number = CodeRuleServiceHelper.getNumber(codeRule, apiLog);
apiLog.set("number", number);
long currentUserId = UserServiceHelper.getCurrentUserId();
DynamicObject user = BusinessDataServiceHelper.loadSingle("bos_user", new QFilter[]{new QFilter("id", QCP.equals, currentUserId)});
apiLog.set("creator", user);
OperateOption option = OperateOption.create();
OperationResult saveResult = OperationServiceHelper
.executeOperate("save", "tqq9_thirdinterfacelogs", new DynamicObject[]{apiLog}, option);

2
lc123/cloud/app/plugin/form/sys/GetGoodsByMaterialBillPlugin.java
View File

@ -51,9 +51,11 @@ public class GetGoodsByMaterialBillPlugin extends AbstractBillPlugIn {
Date expirydate = (Date) this.getModel().getValue("expirydate", rowIndex);
if(material != null){
DynamicObject[] goodsArr = BaseDataMatchUtils.materialMatchGoods(material.getString("number"), lotnumber, producedate, expirydate, false);
if (goodsArr!=null&&goodsArr.length>0) {
this.getModel().setValue("tqq9_goods", goodsArr[0], rowIndex);
}
}
}
// 形态转换单子明细
if("im_adjustbill".equals(dataEntityName) ){

6
lc123/cloud/app/plugin/operate/im/PurOrderPushPurRefundConverPlugin.java
View File

@ -109,12 +109,14 @@ public class PurOrderPushPurRefundConverPlugin extends AbstractConvertPlugIn imp
BigDecimal tqq9_yyhyflje = object.getBigDecimal("tqq9_yyhyflje");//有优惠有返利含税单价
BigDecimal tqq9_yyhwflje = object.getBigDecimal("tqq9_yyhwflje");//有优惠无返利含税单价
String lotnumber = object.getString("lotnumber");//批号
DynamicObject bd_lot = BusinessDataServiceHelper.loadSingle("bd_lot", new QFilter[]{new QFilter("number", QCP.equals, lotnumber)});
DynamicObject tqq9_goods = object.getDynamicObject("tqq9_goods");//商品
String tqq9_wmsdetailid = object.getString("tqq9_wmsdetailid");//WMS分录id
Date producedate = object.getDate("producedate");//生产日期
Date expirydate = object.getDate("expirydate");//生产日期
if (qty.compareTo(BigDecimal.ZERO) > 0) {
DynamicObject dynamicObject1 = dynamicObjectCollection.addNew();
dynamicObject1.set("material", bd_materialpurchaseinfo);
dynamicObject1.set("materialname", materialname);
@ -175,7 +177,7 @@ public class PurOrderPushPurRefundConverPlugin extends AbstractConvertPlugIn imp
dynamicObject1.set("returnbaseqty", returnbaseqty);
dynamicObject1.set("tqq9_yyhyflje", tqq9_yyhyflje);
dynamicObject1.set("tqq9_yyhwflje", tqq9_yyhwflje);
dynamicObject1.set("tqq9_ph",lotnumber);
dynamicObject1.set("tqq9_ph", bd_lot);
dynamicObject1.set("tqq9_goods", tqq9_goods);
dynamicObject1.set("tqq9_inwarebill", dynamicObject);
dynamicObject1.set("tqq9_inwarebillid", billid);
@ -186,7 +188,7 @@ public class PurOrderPushPurRefundConverPlugin extends AbstractConvertPlugIn imp
dynamicObject1.set("tqq9_expiredate", expirydate);
}
}
}
}

1
lc123/cloud/app/plugin/operate/im/ReturnStockSyncNotifierPlugin.java
View File

@ -75,6 +75,7 @@ public class ReturnStockSyncNotifierPlugin extends AbstractOperationServicePlugI
}
}
String rule = BotpParamUtils.getBotpRuleId(PURORDER, RECEIPTNOTICE, "采购订单_收货通知单_转换规则_扩展");
PushArgs pushArgs = BotpParamUtils.getPushArgs(PURORDER, RECEIPTNOTICE, PURORDER_ENTRY, param, entitypkMap, RULE);
ConvertOperationResult pushResult = ConvertServiceHelper.pushAndSave(pushArgs);
List<SourceBillReport> billReports = pushResult.getBillReports();