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

1.入库调整

This commit is contained in:
龚豆豆 2025-11-06 19:01:26 +08:00
parent ba77003686
commit bc469f625c
7 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lc123/cloud/app/api/controller/CasPaybillController.java
View File

@ -58,6 +58,7 @@ public class CasPaybillController {
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("billstatus",dataMap.get("billstatus")); jsonObject.put("billstatus",dataMap.get("billstatus"));
jsonObject.put("tqq9_digital_receipt",dataMap.get("tqq9_digital_receipt")); jsonObject.put("tqq9_digital_receipt",dataMap.get("tqq9_digital_receipt"));
jsonObject.put("tqq9_dzhdbh",dataMap.get("tqq9_dzhdbh"));
billStatusMap.put(billno, jsonObject); billStatusMap.put(billno, jsonObject);
} }
QFilter qFilter = new QFilter("billno", QCP.in, billnos); QFilter qFilter = new QFilter("billno", QCP.in, billnos);
@ -116,6 +117,7 @@ public class CasPaybillController {
JSONObject json = billStatusMap.get(cas_paybill.getString("billno")); JSONObject json = billStatusMap.get(cas_paybill.getString("billno"));
String billstatus = json.getString("billstatus"); String billstatus = json.getString("billstatus");
String tqq9_digital_receipt = json.getString("tqq9_digital_receipt"); String tqq9_digital_receipt = json.getString("tqq9_digital_receipt");
String tqq9_dzhdbh = json.getString("tqq9_dzhdbh");
if (StringUtils.equals("D", billstatus)) { if (StringUtils.equals("D", billstatus)) {
OperationResult payResult = OperationServiceHelper.executeOperate(Constants.TYPE_PAY, Constants.CAS_PAYBILL, new DynamicObject[]{cas_paybill}, option); OperationResult payResult = OperationServiceHelper.executeOperate(Constants.TYPE_PAY, Constants.CAS_PAYBILL, new DynamicObject[]{cas_paybill}, option);
List<IOperateInfo> allErrorOrValidateInfo = payResult.getAllErrorOrValidateInfo(); List<IOperateInfo> allErrorOrValidateInfo = payResult.getAllErrorOrValidateInfo();
@ -127,17 +129,19 @@ public class CasPaybillController {
} }
}else{ }else{
cas_paybill.set("tqq9_digital_receipt", tqq9_digital_receipt); cas_paybill.set("tqq9_digital_receipt", tqq9_digital_receipt);
cas_paybill.set("tqq9_dzhdbh", tqq9_dzhdbh);
cas_paybill.set("tqq9_cwztfkzt", "D");
SaveServiceHelper.save(new DynamicObject[]{cas_paybill}); SaveServiceHelper.save(new DynamicObject[]{cas_paybill});
} }
} else if (StringUtils.equals("F", billstatus) ) { } else if (StringUtils.equals("F", billstatus) ) {
cas_paybill.set("billstatus", "F"); cas_paybill.set("tqq9_cwztfkzt", "F");
SaveServiceHelper.save(new DynamicObject[]{cas_paybill}); SaveServiceHelper.save(new DynamicObject[]{cas_paybill});
} else if (StringUtils.equals("E", billstatus)) { } else if (StringUtils.equals("E", billstatus)) {
cas_paybill.set("billstatus", "E"); cas_paybill.set("tqq9_cwztfkzt", "E");
SaveServiceHelper.save(new DynamicObject[]{cas_paybill}); SaveServiceHelper.save(new DynamicObject[]{cas_paybill});
} else if (StringUtils.equals("G", billstatus)) { } else if (StringUtils.equals("G", billstatus)) {
cas_paybill.set("billstatus", "G"); cas_paybill.set("tqq9_cwztfkzt", "G");
SaveServiceHelper.save(new DynamicObject[]{cas_paybill}); SaveServiceHelper.save(new DynamicObject[]{cas_paybill});
} }
} }

2
lc123/cloud/app/api/controller/WMSSaleOutController.java
View File

@ -906,7 +906,7 @@ public class WMSSaleOutController {
return CustomApiResult.success(wmsXmlReturn); return CustomApiResult.success(wmsXmlReturn);
} }
} }
//销售退货单 //其他出库申请
} else if (StringUtils.equals("tqq9_otheroutapply", orderType)) { } else if (StringUtils.equals("tqq9_otheroutapply", orderType)) {
//查询单据在金蝶系统中是否存在 //查询单据在金蝶系统中是否存在
DynamicObject tqq9_otheroutapply = BusinessDataServiceHelper.loadSingle(TQQ9_OTHEROUTAPPLY, new QFilter[]{new QFilter("billno", QCP.equals, billno)}); DynamicObject tqq9_otheroutapply = BusinessDataServiceHelper.loadSingle(TQQ9_OTHEROUTAPPLY, new QFilter[]{new QFilter("billno", QCP.equals, billno)});

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

@ -2,6 +2,7 @@ package tqq9.lc123.cloud.app.plugin.operate.im;
import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObject;
import kd.bos.dataentity.entity.DynamicObjectCollection; import kd.bos.dataentity.entity.DynamicObjectCollection;
import kd.bos.dataentity.utils.StringUtils;
import kd.bos.entity.ExtendedDataEntity; import kd.bos.entity.ExtendedDataEntity;
import kd.bos.entity.ExtendedDataEntitySet; import kd.bos.entity.ExtendedDataEntitySet;
import kd.bos.entity.botp.plugin.AbstractConvertPlugIn; import kd.bos.entity.botp.plugin.AbstractConvertPlugIn;
@ -50,7 +51,7 @@ public class PurOrderPushPurRefundConverPlugin extends AbstractConvertPlugIn imp
"billentry.amount,billentry.curamount,billentry.taxamount,billentry.curtaxamount," + "billentry.amount,billentry.curamount,billentry.taxamount,billentry.curtaxamount," +
"billentry.discountamount,billentry.amountandtax,billentry.curamountandtax,billentry.returnqty," + "billentry.discountamount,billentry.amountandtax,billentry.curamountandtax,billentry.returnqty," +
"billentry.returnbaseqty,billentry.tqq9_yyhyflje,billentry.tqq9_yyhwflje,billentry.lotnumber," + "billentry.returnbaseqty,billentry.tqq9_yyhyflje,billentry.tqq9_yyhwflje,billentry.lotnumber," +
"billentry.tqq9_goods,billentry.tqq9_wmsdetailid,billentry.producedate,billentry.expirydate,creator,createtime,modifier,modifytime,billentry.owner,billentry.taxrate,billentry.srcbillnumber", new QFilter[]{new QFilter("billentry.mainbillnumber", QCP.equals, mainbillnumber).and("billstatus", QCP.equals, "C")}); "billentry.tqq9_goods,billentry.tqq9_wmsdetailid,billentry.producedate,billentry.expirydate,creator,createtime,modifier,modifytime,billentry.owner,billentry.taxrate,billentry.srcbillnumber,billentry.tqq9_inwarebillentryid", new QFilter[]{new QFilter("billentry.mainbillnumber", QCP.equals, mainbillnumber).and("billstatus", QCP.equals, "C")});
} }
@ -116,6 +117,7 @@ public class PurOrderPushPurRefundConverPlugin extends AbstractConvertPlugIn imp
Date producedate = object.getDate("producedate");//生产日期 Date producedate = object.getDate("producedate");//生产日期
Date expirydate = object.getDate("expirydate");//生产日期 Date expirydate = object.getDate("expirydate");//生产日期
String srcbillnumber = object.getString("srcbillnumber");//来源单据编号（收货单） String srcbillnumber = object.getString("srcbillnumber");//来源单据编号（收货单）
String tqq9_inwarebillentryid = object.getString("tqq9_inwarebillentryid");//入库单分录id
if (qty.compareTo(BigDecimal.ZERO) > 0) { if (qty.compareTo(BigDecimal.ZERO) > 0) {
@ -190,6 +192,21 @@ public class PurOrderPushPurRefundConverPlugin extends AbstractConvertPlugIn imp
dynamicObject1.set("tqq9_productdate", producedate); dynamicObject1.set("tqq9_productdate", producedate);
dynamicObject1.set("tqq9_expiredate", expirydate); dynamicObject1.set("tqq9_expiredate", expirydate);
dynamicObject1.set("tqq9_shbillno", srcbillnumber); dynamicObject1.set("tqq9_shbillno", srcbillnumber);
dynamicObject1.set("tqq9_inwarebillentryid", tqq9_inwarebillentryid);
}else{
for (DynamicObject dynamicObject1 : dynamicObjectCollection) {
String inwarebillentryid = dynamicObject1.getString("tqq9_inwarebillentryid");
if (StringUtils.equals(inwarebillentryid,tqq9_inwarebillentryid)){
BigDecimal qty1 = dynamicObject1.getBigDecimal("qty");
BigDecimal add = qty1.add(qty);
dynamicObject1.set("tqq9_inwarebillentryqty", add);
dynamicObject1.set("tqq9_maxqty", add);
dynamicObject1.set("qty", add);
dynamicObject1.set("baseqty", add);
}
}
} }
} }

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

@ -24,6 +24,8 @@ import tqq9.lc123.cloud.app.api.utils.Constants;
import tqq9.lc123.cloud.app.plugin.utils.BotpParamUtils; import tqq9.lc123.cloud.app.plugin.utils.BotpParamUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.*; import java.util.*;
/** /**
@ -69,6 +71,8 @@ public class ReturnStockSyncNotifierPlugin extends AbstractOperationServicePlugI
entitypkMap.computeIfAbsent(pm_purorderbill.getLong("id"), k -> new HashSet<>()).add(entry1.getLong("id")); entitypkMap.computeIfAbsent(pm_purorderbill.getLong("id"), k -> new HashSet<>()).add(entry1.getLong("id"));
JSONObject jsonObject = new JSONObject(); JSONObject jsonObject = new JSONObject();
jsonObject.put("qty",qty); jsonObject.put("qty",qty);
long timestamp = LocalDateTime.now().toEpochSecond(ZoneOffset.UTC);
jsonObject.put("timestamp",timestamp);
param.computeIfAbsent(id, k -> new HashSet<>()).add(jsonObject); param.computeIfAbsent(id, k -> new HashSet<>()).add(jsonObject);
} }

10
lc123/cloud/app/plugin/operate/pm/OtherOutWareSaveOpPlugin.java
View File

@ -19,8 +19,8 @@ import java.util.stream.Collectors;
*/ */
public class OtherOutWareSaveOpPlugin extends AbstractOperationServicePlugIn implements Plugin { public class OtherOutWareSaveOpPlugin extends AbstractOperationServicePlugIn implements Plugin {
private final static Log logger = LogFactory.getLog(OtherOutWareSaveOpPlugin.class); private final static Log logger = LogFactory.getLog(OtherOutWareSaveOpPlugin.class);
private static String IM_OTHERINBILL = "im_otherinbill";//其他入库 private static String TQQ9_OTHEROUTAPPLY = "tqq9_otheroutapply";//其他出库申请
private static String TQQ9_OTHERINAPPLY = "tqq9_otherinapply";//其他入库申请 private static String IM_OTHEROUTBILL = "im_otheroutbill";//其他出库
private static String billentry = "billentry";//分录标识 private static String billentry = "billentry";//分录标识
@Override @Override
@ -35,13 +35,13 @@ public class OtherOutWareSaveOpPlugin extends AbstractOperationServicePlugIn imp
if (billentry1.size() > 0) { if (billentry1.size() > 0) {
DynamicObject dynamicObject1 = billentry1.get(0); DynamicObject dynamicObject1 = billentry1.get(0);
String srcbillnumber = dynamicObject1.getString("srcbillnumber"); String srcbillnumber = dynamicObject1.getString("srcbillnumber");
DynamicObject pm_purorderbill = BusinessDataServiceHelper.loadSingle(TQQ9_OTHERINAPPLY, new QFilter[]{new QFilter("billno", QCP.equals, srcbillnumber)}); DynamicObject pm_purorderbill = BusinessDataServiceHelper.loadSingle(TQQ9_OTHEROUTAPPLY, new QFilter[]{new QFilter("billno", QCP.equals, srcbillnumber)});
DynamicObjectCollection dynamicObjects = new DynamicObjectCollection(); DynamicObjectCollection dynamicObjects = new DynamicObjectCollection();
dynamicObjects.add(pm_purorderbill); dynamicObjects.add(pm_purorderbill);
dynamicObjects.stream().collect(Collectors.toList()); dynamicObjects.stream().collect(Collectors.toList());
AutoFixLinkUtil fixLinkHelp = new AutoFixLinkUtil(); AutoFixLinkUtil fixLinkHelp = new AutoFixLinkUtil();
fixLinkHelp.linkSourceRow(dynamicObject, dynamicObjects.stream().collect(Collectors.toList()), IM_OTHERINBILL, billentry, "srcbillentryid", fixLinkHelp.linkSourceRow(dynamicObject, dynamicObjects.stream().collect(Collectors.toList()), IM_OTHEROUTBILL, billentry, "srcbillentryid",
TQQ9_OTHERINAPPLY, billentry, "", "billentry_lk"); TQQ9_OTHEROUTAPPLY, billentry, "", "billentry_lk");
} }
} }

6
lc123/cloud/app/plugin/operate/pm/PurOrderBillRebatePlugin.java
View File

@ -191,7 +191,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp
lcLogService.savelog("FL-解锁返利金额",Cancel_URL,false,true, queryMap.toString(), bodyString); lcLogService.savelog("FL-解锁返利金额",Cancel_URL,false,true, queryMap.toString(), bodyString);
} }
} catch (IOException ex) { } catch (IOException ex) {
lcLogService.savelog("FL-解锁返利金额",Cancel_URL,false,true, queryMap.toString(), "接口调用报错，errormessage:"+ex.getMessage()); lcLogService.savelog("FL-解锁返利金额",Cancel_URL,false,false, queryMap.toString(), "接口调用报错，errormessage:"+ex.getMessage());
throw new RuntimeException(ex); throw new RuntimeException(ex);
} }
@ -395,7 +395,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp
SaveServiceHelper.save(new DynamicObject[]{dataEntity}); SaveServiceHelper.save(new DynamicObject[]{dataEntity});
} }
} catch (IOException ex) { } catch (IOException ex) {
lcLogService.savelog("FL-使用返利金额",Use_URL,false,true, bodyMap.toString(), "接口调用报错，errormessage:"+ex.getMessage()); lcLogService.savelog("FL-使用返利金额",Use_URL,false,false, bodyMap.toString(), "接口调用报错，errormessage:"+ex.getMessage());
throw new RuntimeException(ex); throw new RuntimeException(ex);
} }
} }
@ -424,7 +424,7 @@ public class PurOrderBillRebatePlugin extends AbstractOperationServicePlugIn imp
SaveServiceHelper.save(new DynamicObject[]{dataEntity}); SaveServiceHelper.save(new DynamicObject[]{dataEntity});
} }
} catch (IOException ex) { } catch (IOException ex) {
lcLogService.savelog("FL-使用返利金额",Use_URL,false,true, bodyMap.toString(), "接口调用报错，errormessage:"+ex.getMessage()); lcLogService.savelog("FL-使用返利金额",Use_URL,false,false, bodyMap.toString(), "接口调用报错，errormessage:"+ex.getMessage());
throw new RuntimeException(ex); throw new RuntimeException(ex);
} }
} }

3
lc123/cloud/app/plugin/utils/AutoFixLinkUtil.java
View File

@ -6,7 +6,6 @@ import kd.bos.entity.EntityMetadataCache;
import kd.bos.entity.botp.runtime.TableDefine; import kd.bos.entity.botp.runtime.TableDefine;
import kd.bos.logging.Log; import kd.bos.logging.Log;
import kd.bos.logging.LogFactory; import kd.bos.logging.LogFactory;
import tqq9.lc123.cloud.app.plugin.operate.pm.PurRefundApplySaveOpPlugin;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
@ -18,7 +17,7 @@ import java.util.Map;
* @author rd_johnnyding * @author rd_johnnyding
*/ */
public class AutoFixLinkUtil { public class AutoFixLinkUtil {
private final static Log logger = LogFactory.getLog(PurRefundApplySaveOpPlugin.class); private final static Log logger = LogFactory.getLog(AutoFixLinkUtil.class);
/** /**