aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-07-07 18:42:16 +08:00
parent 82ecda4c00
commit 7ddadbd494
3 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSettleSubBill.java
View File

@ -84,4 +84,6 @@ public class EmisSettleSubBill extends BaseEntity
// 扩展参数 // 扩展参数
private EmisWaybill waybillDetail; private EmisWaybill waybillDetail;
} }

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillAjustApplyServiceImpl.java
View File

@ -178,6 +178,12 @@ public class EmisWaybillAjustApplyServiceImpl extends EmisBaseService implements
emisWaybillAjustApply.setBlCenterConfirmed("1"); emisWaybillAjustApply.setBlCenterConfirmed("1");
emisWaybillAjustApply.setCenterConfirmManCode(getCurrentUser().getEmpCode()); emisWaybillAjustApply.setCenterConfirmManCode(getCurrentUser().getEmpCode());
// 获取账单状态，若账单处于非未确认状态，不允许审核
EmisSettleSubBill emisSettleSubBill=getSettleSubBillByBillCode(emisWaybillAjustApply.getBillCode());
if("1".equals(emisSettleSubBill.getBlConfirm())){
throw new EmisBizError(EmisBizErrorType.FAIL,"财务账单已确认，请先取消确认！");
}
// 运单更新 // 运单更新
JSONObject jsonObject = JSONObject.parseObject(emisWaybillAjustApply.getJsonData()); JSONObject jsonObject = JSONObject.parseObject(emisWaybillAjustApply.getJsonData());
JSONObject newValueJObj=jsonObject.getJSONObject("newValue"); JSONObject newValueJObj=jsonObject.getJSONObject("newValue");

2
emis-biz/src/main/resources/mapper/EmisSettleSubBillMapper.xml
View File

@ -28,6 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="siteConfirmDate" column="site_confirm_date" /> <result property="siteConfirmDate" column="site_confirm_date" />
<result property="siteConfirmManCode" column="site_confirm_man_code" /> <result property="siteConfirmManCode" column="site_confirm_man_code" />
<result property="siteConfirmNote" column="site_confirm_note" /> <result property="siteConfirmNote" column="site_confirm_note" />
</resultMap> </resultMap>
<resultMap id="EmisSettleSubBillResult" type="EmisSettleSubBill" extends="BaseEmisSettleSubBillResult" > <resultMap id="EmisSettleSubBillResult" type="EmisSettleSubBill" extends="BaseEmisSettleSubBillResult" >