Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpInvoicePlan.java =================================================================== diff -u -r20060 -r20190 --- ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpInvoicePlan.java (.../HrpInvoicePlan.java) (revision 20060) +++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpInvoicePlan.java (.../HrpInvoicePlan.java) (revision 20190) @@ -5,7 +5,7 @@ import java.util.Date; /** - * zszy一次性物品申请单 + * zsyy一次性物品申请单 */ public class HrpInvoicePlan { /** Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r20182 -r20190 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 20182) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 20190) @@ -5507,7 +5507,7 @@ return null; } - //zzsy一次性申请单定时同步 + //zsyy一次性申请单定时同步 @Override public void timingSyncHrpDisposableGoodsInvoicePlan() { //获得已申请单的单号 Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java =================================================================== diff -u -r20183 -r20190 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java (.../InventoryManagerImpl.java) (revision 20183) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManagerImpl.java (.../InventoryManagerImpl.java) (revision 20190) @@ -1685,7 +1685,7 @@ materialDefinitionManager.save(md); } -/////////zsyyHrp一次性物品申请单//////////// +/////////Hrp一次性物品申请单//////////// @Override public Collection findInvoicePlanByTimeAndPage(Date startDate,Date endDate,int pagesize,int pagenumber,List serialNumbers) { Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManager.java =================================================================== diff -u -r20153 -r20190 --- ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManager.java (.../InventoryManager.java) (revision 20153) +++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/InventoryManager.java (.../InventoryManager.java) (revision 20190) @@ -41,7 +41,7 @@ /** - * 根据分页,时间,已申请的一次性物品申请单号过滤获得:zzsyHrp同步申请单集合. + * 根据分页,时间,已申请的一次性物品申请单号过滤获得:Hrp同步申请单集合. * @param startDate 开始时间 * @param endDate 结束时间 * @param pagesize 第几页 @@ -52,7 +52,7 @@ public Collection findInvoicePlanByTimeAndPage(Date startDate, Date endDate,int pagesize,int pagenumber,List serialNumbers); /** - * 根据时间,已申请的一次性物品申请单过滤获得:zzsyHrp同步申请单的总数. + * 根据时间,已申请的一次性物品申请单过滤获得:Hrp同步申请单的总数. * @param startDate 开始时间 * @param endDate 结束时间 * @param serialNumbers 已申请的一次性物品申请单号集合 @@ -62,28 +62,24 @@ /** - * 根据已申请单的申请单号过滤获得:zzsyHrp申请单集合 + * 根据已申请单的申请单号过滤获得:Hrp申请单集合 * @param serialNumbers 已申请的一次性物品申请单号集合 * @return List:HrpInvoicePlan同步申请单集合 */ public List findHrpInvoicePlanpListByappliedSerialNumbers(List serialNumbers); /** - * 根据同步申请单号:获得zzsyHrp申请单明细集合 + * 根据同步申请单号:获得Hrp申请单明细集合 * @param serialNumber 同步申请单号 * @return List:HrpTousseItem同步申请单明细集合 */ public List findHrpTousseItemBySerialNumber(String SerialNumber); /** - * 根据同步申请单号:获得zzsyHrp申请单 + * 根据同步申请单号:获得Hrp申请单 * @param serialNumber 同步申请单号 * @return HrpInvoicePlan:HrpInvoicePlan同步申请单 */ public HrpInvoicePlan findHrpInvoicePlanBySerialNumber(String serialNumber); - - - - } \ No newline at end of file Index: ssts-web/src/main/resources/config/zsyy/mybatis/InvoicePlanFromHERP_Mapper.xml =================================================================== diff -u -r20153 -r20190 --- ssts-web/src/main/resources/config/zsyy/mybatis/InvoicePlanFromHERP_Mapper.xml (.../InvoicePlanFromHERP_Mapper.xml) (revision 20153) +++ ssts-web/src/main/resources/config/zsyy/mybatis/InvoicePlanFromHERP_Mapper.xml (.../InvoicePlanFromHERP_Mapper.xml) (revision 20190) @@ -28,7 +28,7 @@ FROM apps.CSSD_InvoicePlan WHERE 1=1 ]]> - + and serialNumber not in #{serialNumbers} @@ -63,7 +63,7 @@ and applicationTime <= #{endDate} ]]> - + and serialNumber not in #{serialNumbers} Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java =================================================================== diff -u -r20153 -r20190 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 20153) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java (.../RecyclingApplicationManager.java) (revision 20190) @@ -324,7 +324,7 @@ /** - * 根据分页,时间,获得:zzsyHrp同步申请单集合(通过已申请的一次性物品申请单过滤) + * 根据分页,时间,获得:Hrp同步申请单集合(通过已申请的一次性物品申请单过滤) * @param startDate 开始时间 * @param endDate 结束时间 * @param pagesize 第几页 @@ -334,30 +334,30 @@ public Collection findInvoicePlanByTimeAndPage(Date startDate,Date endDate, int pagesize, int pagenumber); /** - * 根据时间:获得zzsyHrp申请单总数(通过已申请的一次性物品申请单过滤) + * 根据时间:获得Hrp申请单总数(通过已申请的一次性物品申请单过滤) * @param startDate 开始时间 * @param endDate 结束时间 * @return List */ public int findInvoicePlanTotalByTime(Date startDate, Date endDate); /** - * 根据申请单号数组:获得zzsyHrp申请单明细集合. + * 根据申请单号数组:获得Hrp申请单明细集合. * @param serialNumberarry 申请单号数组 * @return List */ public List HrpInvoicePlanListByserialNumberS(String[] serialNumberarry); /** - * 根据申请单号数组:获得zzsyHrp申请单明细集合. + * 根据申请单号数组:获得Hrp申请单明细集合. * @param serialNumberarry 申请单号数组 * @return List */ public List findHrpTousseItemListByserialNumber(String serialNumber); /** - * zzsyHrp申请单定时同步 + * zsyyHrp申请单定时同步 * @return void */ public void timingSyncHrpDisposableGoodsInvoicePlan(); Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpTousseItem.java =================================================================== diff -u -r20079 -r20190 --- ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpTousseItem.java (.../HrpTousseItem.java) (revision 20079) +++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/HrpTousseItem.java (.../HrpTousseItem.java) (revision 20190) @@ -1,7 +1,7 @@ package com.forgon.disinfectsystem.inventorymanagement.model; /** * - *zszy一次性物品申请单明细 + *zsyy一次性物品申请单明细 * */ public class HrpTousseItem {