diff --git a/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java b/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java
index ccf9410..6c782ec 100644
--- a/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java
+++ b/src/main/java/com/dev/swms/server/service/order/pojo/DefaultCustomsOrderManager.java
@@ -291,6 +291,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
f=commonDao.load(Fee.class, id);
customsOrderId=f.getOrderId();
commonDao.delete(f);
+
+ wmsOperationHisManager.storeOperationHis(f.getId(),f.getBillCode(), null,
+ f.getFeeName().getName() , "费用删除", "费用删除",null,
+ null,0, 0,0, 0,f.getFeeName().getName()+"费用删除" , "WMS");
}
if(f!=null){
RefreshFee(customsOrderId,f.getBillType(),f.getPayOrReceive());//刷新
@@ -3218,6 +3222,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
fee.setSubmitPeople(UserHolder.getUser().getName());
fee.setSubmitDate(new Date());
commonDao.store(fee);
+
+ wmsOperationHisManager.storeOperationHis(fee.getId(),fee.getBillCode(), null,
+ fee.getFeeName().getName() , "费用提交", "费用提交",null,
+ null,0, 0,0, 0,fee.getFeeName().getName()+"费用状态【未审核】修改为【已提交】" , "WMS");
}
}
@@ -3263,6 +3271,11 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
commonDao.store(fee);
}
}
+
+
+ wmsOperationHisManager.storeOperationHis(customsOrder.getId(),customsOrder.getCode(), null,
+ customsOrder.getCode() , "应收费用管理-提交", "应收费用管理-提交",null,
+ null,0, 0,0, 0,customsOrder.getCode()+"业务编号的状态修改为【已提交】,单据明细状态【已提交】" , "WMS");
}
@@ -3347,6 +3360,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
Fee fee=this.load(Fee.class, id);
fee.setStatus("未审核");
commonDao.store(fee);
+
+ wmsOperationHisManager.storeOperationHis(fee.getId(),fee.getBillCode(), null,
+ fee.getFeeName().getName() , "费用退回", "费用退回",null,
+ null,0, 0,0, 0,fee.getFeeName().getName()+"费用状态【已提交】修改为【未审核】" , "WMS");
}
}
@@ -3432,7 +3449,12 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
f.setExaminePeople(UserHolder.getUser().getName());
f.setExamineDate(new Date());
commonDao.store(f);
+
+ wmsOperationHisManager.storeOperationHis(f.getId(),f.getBillCode(), null,
+ f.getFeeName().getName() , "费用审核-部门审核", "费用审核-部门审核",null,
+ null,0, 0,0, 0,f.getFeeName().getName()+"费用状态【已提交】修改为【已审核】" , "WMS");
}
+
}
@Override
@@ -3443,6 +3465,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
f.setFinancePeople(UserHolder.getUser().getName());
f.setFinanceDate(new Date());
commonDao.store(f);
+
+ wmsOperationHisManager.storeOperationHis(f.getId(),f.getBillCode(), null,
+ f.getFeeName().getName() , "费用审核-财务审核", "费用审核-财务审核",null,
+ null,0, 0,0, 0,f.getFeeName().getName()+"费用状态【已审核】修改为【财务审核】" , "WMS");
}
}
@@ -3452,6 +3478,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
Fee f=this.load(Fee.class, id);
f.setStatus("已审核");
commonDao.store(f);
+
+ wmsOperationHisManager.storeOperationHis(f.getId(),f.getBillCode(), null,
+ f.getFeeName().getName() , "应付费用管理-财务退回", "应付费用管理-财务退回",null,
+ null,0, 0,0, 0,f.getFeeName().getName()+"费用状态【财务审核】修改为【已审核】" , "WMS");
}
}
@@ -3462,6 +3492,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
Fee f=this.load(Fee.class, id);
f.setStatus("已提交");
commonDao.store(f);
+
+ wmsOperationHisManager.storeOperationHis(f.getId(),f.getBillCode(), null,
+ f.getFeeName().getName() , "应付费用管理-退回部门", "应付费用管理-退回部门",null,
+ null,0, 0,0, 0,f.getFeeName().getName()+"费用状态【已审核】修改为【已提交】" , "WMS");
}
}
@@ -3471,6 +3505,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
Fee f=this.load(Fee.class, id);
f.setStatus("财务提交");
commonDao.store(f);
+
+ wmsOperationHisManager.storeOperationHis(f.getId(),f.getBillCode(), null,
+ f.getFeeName().getName() , "应付费用管理-财务提交", "应付费用管理-财务提交",null,
+ null,0, 0,0, 0,f.getFeeName().getName()+"费用状态【已开票】修改为【财务提交】" , "WMS");
}
}
@@ -3480,6 +3518,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
Fee f=this.load(Fee.class, id);
f.setStatus("已审核");
commonDao.store(f);
+
+ wmsOperationHisManager.storeOperationHis(f.getId(),f.getBillCode(), null,
+ f.getFeeName().getName() , "副总应付费用审核-退回财务", "副总应付费用审核-退回财务",null,
+ null,0, 0,0, 0,f.getFeeName().getName()+"费用状态【财务提交】修改为【已审核】" , "WMS");
}
}
@@ -3491,6 +3533,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
f.setVicePeople(UserHolder.getUser().getName());
f.setViceDate(new Date());
commonDao.store(f);
+
+ wmsOperationHisManager.storeOperationHis(f.getId(),f.getBillCode(), null,
+ f.getFeeName().getName() , "副总应付费用审核-副总审核", "副总应付费用审核-副总审核",null,
+ null,0, 0,0, 0,f.getFeeName().getName()+"费用状态【财务提交】修改为【副总审核】" , "WMS");
}
}
@@ -3500,6 +3546,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
Fee f=this.load(Fee.class, id);
f.setStatus("副总提交");
commonDao.store(f);
+
+ wmsOperationHisManager.storeOperationHis(f.getId(),f.getBillCode(), null,
+ f.getFeeName().getName() , "副总应付费用审核-副总提交", "副总应付费用审核-副总提交",null,
+ null,0, 0,0, 0,f.getFeeName().getName()+"费用状态【副总审核】修改为【副总提交】" , "WMS");
}
}
@@ -3509,6 +3559,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
Fee f=this.load(Fee.class, id);
f.setStatus("财务提交");
commonDao.store(f);
+
+ wmsOperationHisManager.storeOperationHis(f.getId(),f.getBillCode(), null,
+ f.getFeeName().getName() , "退回副总", "退回副总",null,
+ null,0, 0,0, 0,f.getFeeName().getName()+"费用状态【副总提交】修改为【财务提交】" , "WMS");
}
}
@@ -3520,6 +3574,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
f.setPresidentPeople(UserHolder.getUser().getName());
f.setPresidentDate(new Date());
commonDao.store(f);
+
+ wmsOperationHisManager.storeOperationHis(f.getId(),f.getBillCode(), null,
+ f.getFeeName().getName() , "总经理审核", "总经理审核",null,
+ null,0, 0,0, 0,f.getFeeName().getName()+"费用状态【副总提交】修改为【总经理审核】" , "WMS");
}
}
@@ -3530,6 +3588,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
// f.setPresidentPeople(UserHolder.getUser().getName());
// f.setPresidentDate(new Date());
commonDao.store(f);
+
+ wmsOperationHisManager.storeOperationHis(f.getId(),f.getBillCode(), null,
+ f.getFeeName().getName() , "总经理退回", "总经理退回",null,
+ null,0, 0,0, 0,f.getFeeName().getName()+"费用状态【总经理审核】修改为【副总提交】" , "WMS");
}
}
@@ -3757,6 +3819,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
fee.setStatus("已付款");
imageFileManager.importLegsImageZip(id, file1,file2,file3,file4,file5,imageType, objectType,waterNoDesc);
commonDao.store(fee);
+
+ wmsOperationHisManager.storeOperationHis(fee.getId(),fee.getBillCode(), null,
+ fee.getFeeName().getName() , "应付费用管理-付款登记", "应付费用管理-付款登记",null,
+ null,0, 0,0, 0,fee.getFeeName().getName()+"费用状态【财务审核】修改为【已付款】" , "WMS");
}
}
@@ -3771,6 +3837,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
fee.setStatus("已开票");
imageFileManager.importLegsImageZip(id,file1,file2,file3,file4,file5,imageType,objectType,null);
commonDao.store(fee);
+
+ wmsOperationHisManager.storeOperationHis(fee.getId(),fee.getBillCode(), null,
+ fee.getFeeName().getName() , "应付费用管理-付款登记", "应付费用管理-付款登记",null,
+ null,0, 0,0, 0,fee.getFeeName().getName()+"费用状态|总经理审核|已付款|总经理审核|副总审核 修改为【已开票】" , "WMS");
}
}
@@ -3830,6 +3900,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
}
+ wmsOperationHisManager.storeOperationHis(billFee.getId(),billFee.getCode(), null,
+ billFee.getCode() , "应付费用审核-退回", "应付费用审核-退回",null,
+ null,0, 0,0, 0,billFee.getCode()+"对账单会【删除】，明细费用【已提交】修改为【未审核】" , "WMS");
+
}
}
@@ -3876,6 +3950,11 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
}
commonDao.store(bf);
+
+ String des="开票单位:"+issuingOffice+";发票号:"+invoiceNo+";开票金额:"+issuingMoney+";开票日期:"+issuingDate+";invoiceType:"+invoiceType+";税率:"+tax;
+ wmsOperationHisManager.storeOperationHis(bf.getId(),bf.getCode(), null,
+ bf.getCode() , "开票管理-发票登记", "开票管理-发票登记",null,
+ null,0, 0,0, 0,des, "WMS");
}
}
@@ -3886,6 +3965,11 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
bf.setCourierNo(courierNo);
bf.setBillDateStart(billDateStart);
commonDao.store(bf);
+
+ String des="快递单号:"+courierNo+";寄件日期:"+billDateStart;
+ wmsOperationHisManager.storeOperationHis(bf.getId(),bf.getCode(), null,
+ bf.getCode() , "开票管理-发票登记", "开票管理-发票登记",null,
+ null,0, 0,0, 0,des, "WMS");
}
}
@@ -3896,6 +3980,11 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
bf.setCashTime(cashTime);
bf.setAuditAmount(auditAmount);
commonDao.store(bf);
+
+ String des="实收金额:"+auditAmount+";收款时间:"+cashTime;
+ wmsOperationHisManager.storeOperationHis(bf.getId(),bf.getCode(), null,
+ bf.getCode() , "收款管理-收款登记", "收款管理-收款登记",null,
+ null,0, 0,0, 0,des, "WMS");
}
}
@@ -3909,7 +3998,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
fee.setInvoiceType(invoiceType);
fee.setTax(tax);
commonDao.store(fee);
-
+ String des="发票号:"+invoiceNo+";税率:"+tax+";发票类型:"+invoiceType+";付款时间:"+paymentDate+";实际付款金额:"+actualMoney;
+ wmsOperationHisManager.storeOperationHis(fee.getId(),fee.getBillCode(), null,
+ fee.getFeeName().getName() , "应付费用管理-特殊修改", "应付费用管理-特殊修改",null,
+ null,0, 0,0, 0,des, "WMS");
}
}
@@ -4084,6 +4176,11 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
BillFee bf=commonDao.load(BillFee.class, id);
bf.setOperatorDate(operatorDate);//客户确认
commonDao.store(bf);
+ String des="客户登记时间:"+operatorDate;
+ wmsOperationHisManager.storeOperationHis(bf.getId(),bf.getCode(), null,
+ bf.getCode() , "应收费用审核-客户确认登记", "应收费用审核-客户确认登记",null,
+ null,0, 0,0, 0,des, "WMS");
+
}
}
@@ -4093,6 +4190,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
BillFee bf=commonDao.load(BillFee.class, id);
bf.setOperatorDate(null);//客户确认
commonDao.store(bf);
+ String des="客户登记时间:清空";
+ wmsOperationHisManager.storeOperationHis(bf.getId(),bf.getCode(), null,
+ bf.getCode() , "销售确认管理-退回", "销售确认管理-退回",null,
+ null,0, 0,0, 0,des, "WMS");
}
}
@@ -4117,6 +4218,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
co.setFeeStatus(bf.getStatus());
commonDao.store(co);
}
+ String des=bf.getCode()+"状态【已审核】修改为【已提交】,费用明细状态为【已提交】";
+ wmsOperationHisManager.storeOperationHis(bf.getId(),bf.getCode(), null,
+ bf.getCode() , "退回", "退回",null,
+ null,0, 0,0, 0,des, "WMS");
}
}
@@ -4221,6 +4326,10 @@ public class DefaultCustomsOrderManager extends DefaultBaseManager implements Cu
co.setBlanExamine(blanExamine);
commonDao.store(co);
}
+ String des=bf.getCode()+"状态【已提交】修改为【已审核】,费用明细状态为【已审核】";
+ wmsOperationHisManager.storeOperationHis(bf.getId(),bf.getCode(), null,
+ bf.getCode() , "销售确认管理-审核", "销售确认管理-审核",null,
+ null,0, 0,0, 0,des, "WMS");
}
}
diff --git a/src/webapp/WEB-INF/classes/dataSourceContext.xml b/src/webapp/WEB-INF/classes/dataSourceContext.xml
index ea8acf7..4d1f328 100644
--- a/src/webapp/WEB-INF/classes/dataSourceContext.xml
+++ b/src/webapp/WEB-INF/classes/dataSourceContext.xml
@@ -32,10 +32,10 @@
- jjwl
+ jjtest3
- jjwl
+ jjtest3
200