|
@@ -755,6 +755,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
String key = "";//键
|
|
|
long actId = 0L;//活动id
|
|
|
Long fPid = null;
|
|
|
+ Long billStatus = null;
|
|
|
Map<String, Object> map = new HashMap<>();
|
|
|
if ("KHDD".equals(billsType)) {
|
|
|
actId = 410L;
|
|
@@ -768,6 +769,11 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
if ("0".equals(sysConfig.getConfigValue())) {
|
|
|
isApprove = true;
|
|
|
}
|
|
|
+ if (isApprove) {
|
|
|
+ billStatus = 4L;
|
|
|
+ } else {
|
|
|
+ billStatus = 6L;
|
|
|
+ }
|
|
|
TWarehouseBills warehouseBills = JSONArray.parseObject(tWarehousebills, TWarehouseBills.class);
|
|
|
JSONArray jsonCrArray = JSONArray.parseArray(tWarehousebillsCntr);
|
|
|
List<TWarehousebillsCntr> tWarehousebillsCntrs = JSONObject.parseArray(jsonCrArray.toJSONString(), TWarehousebillsCntr.class);
|
|
@@ -785,11 +791,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
warehouseBills.setfCorpid(clientFid);
|
|
|
warehouseBills.setfContacts(loginUser.getUser().getUserName());
|
|
|
warehouseBills.setfTel(loginUser.getUser().getPhonenumber());
|
|
|
- if (isApprove) {
|
|
|
- warehouseBills.setfBillstatus(4L);
|
|
|
- } else {
|
|
|
- warehouseBills.setfBillstatus(6L);
|
|
|
- }
|
|
|
+ warehouseBills.setfBillstatus(billStatus);
|
|
|
+ warehouseBills.setfTimes(1L);
|
|
|
int i = tWarehouseBillsMapper.insertTWarehousebills(warehouseBills);
|
|
|
if (CollectionUtils.isNotEmpty(tWarehousebillsCntrs)) {
|
|
|
for (TWarehousebillsCntr warehousebillsCntr : tWarehousebillsCntrs) {
|
|
@@ -811,11 +814,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
fPid = warehouseBills.getfId();
|
|
|
warehouseBills.setUpdateTime(DateUtils.getNowDate());
|
|
|
warehouseBills.setUpdateBy(SecurityUtils.getUsername());
|
|
|
- if (isApprove) {
|
|
|
- warehouseBills.setfBillstatus(4L);
|
|
|
- } else {
|
|
|
- warehouseBills.setfBillstatus(6L);
|
|
|
- }
|
|
|
+ warehouseBills.setfBillstatus(billStatus);
|
|
|
+ warehouseBills.setfTimes(tWarehouseBills.getfTimes() + 1);
|
|
|
tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
|
|
|
tWarehousebillsCntrMapper.deleteTWarehousebillsCntrfPid(warehouseBills.getfId());
|
|
|
if (CollectionUtils.isNotEmpty(tWarehousebillsCntrs)) {
|
|
@@ -852,6 +852,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
auditItems.setAuditOpTime(new Date());
|
|
|
auditItems.setAuditMsg("提交");
|
|
|
auditItems.setAuditStatus("O");
|
|
|
+ auditItems.setFidStatus("f_billstatus");
|
|
|
+ auditItems.setTimes(1L);
|
|
|
AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);
|
|
|
// Long code = Long.valueOf(String.valueOf(approvalFlow.get("code"))).longValue();
|
|
|
String code = approvalFlow.get("code").toString();
|
|
@@ -954,6 +956,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
return AjaxResult.error("当前数据不允许提交");
|
|
|
}
|
|
|
+ warehouseBills.setfTimes(tWarehouseBills.getfTimes() + 1);
|
|
|
tWarehouseBillsMapper.updateTWarehousebills(warehouseBills);
|
|
|
tWarehousebillsCntritemsMapper.deleteTWarehousebillsCntritemsfPid(warehouseBills.getfId());
|
|
|
if (CollectionUtils.isNotEmpty(tWarehousebillsCntritemsList)) {
|
|
@@ -989,6 +992,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
auditItems.setAuditOpTime(new Date());
|
|
|
auditItems.setAuditMsg("提交");
|
|
|
auditItems.setAuditStatus("O");
|
|
|
+ auditItems.setFidStatus("f_billstatus");
|
|
|
+ auditItems.setTimes(1L);
|
|
|
AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);
|
|
|
// Long code = Long.valueOf(String.valueOf(approvalFlow.get("code"))).longValue();
|
|
|
String code = approvalFlow.get("code").toString();
|
|
@@ -2271,6 +2276,7 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
if (tWarehouseBills.getfBillstatus() != 11L) {
|
|
|
return AjaxResult.error("订单未审核完成,暂不支持维护提单号");
|
|
|
}
|
|
|
+ warehouseBills.setfTimes(tWarehouseBills.getfTimes() + 1);
|
|
|
/*TWarehouseBills bills = new TWarehouseBills();
|
|
|
bills.setfId(warehouseBills.getfId());
|
|
|
bills.setfMblno(warehouseBills.getfMblno());*/
|
|
@@ -2368,6 +2374,8 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService {
|
|
|
auditItems.setAuditOpTime(new Date());
|
|
|
auditItems.setAuditMsg("提交");
|
|
|
auditItems.setAuditStatus("O");
|
|
|
+ auditItems.setFidStatus("f_billstatus");
|
|
|
+ auditItems.setTimes(1L);
|
|
|
AjaxResult approvalFlow = auditItemsService.createApprovalFlow(auditItems);
|
|
|
// Long code = Long.valueOf(String.valueOf(approvalFlow.get("code"))).longValue();
|
|
|
String code = approvalFlow.get("code").toString();
|