Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntryItem.java =================================================================== diff -u -r20812 -r20822 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntryItem.java (.../ExpensiveGoodsGodownEntryItem.java) (revision 20812) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntryItem.java (.../ExpensiveGoodsGodownEntryItem.java) (revision 20822) @@ -17,6 +17,7 @@ @Entity @Table(indexes={@Index(columnList="expensiveGoodsId",name="eggei_egid_index") ,@Index(columnList="expensiveGoodsEntry_id",name="eggei_egeid_index") +,@Index(columnList="supplierId",name="egge_spid_index") ,@Index(columnList="warehouseID",name="eggei_whid_index") }) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) @@ -55,8 +56,13 @@ private String certification; /** - * 供应商 + * 供应商id */ + private String supplierId; + + /** + * 供应商名称 + */ private String supplierName; /** @@ -118,6 +124,14 @@ this.certification = certification; } + public String getSupplierId() { + return supplierId; + } + + public void setSupplierId(String supplierId) { + this.supplierId = supplierId; + } + public String getSupplierName() { return supplierName; } Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryItemManagerImpl.java =================================================================== diff -u -r20812 -r20822 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryItemManagerImpl.java (.../ExpensiveGoodsGodownEntryItemManagerImpl.java) (revision 20812) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryItemManagerImpl.java (.../ExpensiveGoodsGodownEntryItemManagerImpl.java) (revision 20822) @@ -15,7 +15,6 @@ import com.forgon.directory.model.BarcodeDevice; import com.forgon.directory.model.OrgUnit; import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; -import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveDisposablegoods; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsGodownEntry; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsGodownEntryItem; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsInstance; Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntry.java =================================================================== diff -u -r20812 -r20822 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntry.java (.../ExpensiveGoodsGodownEntry.java) (revision 20812) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/ExpensiveGoodsGodownEntry.java (.../ExpensiveGoodsGodownEntry.java) (revision 20822) @@ -25,14 +25,13 @@ /** * 高值耗材入/退库单 * @author shuyongfu - * + * @since 2017-11-14 */ @Entity @Table(indexes={@Index(columnList="type",name="egge_type_index") ,@Index(columnList="subType",name="egge_subtype_index") ,@Index(columnList="orgUnitCode",name="egge_ouc_index") ,@Index(columnList="warehouseID",name="egge_whid_index") -,@Index(columnList="supplierId",name="egge_spid_index") }) @Cache(usage = CacheConcurrencyStrategy.NONSTRICT_READ_WRITE) public class ExpensiveGoodsGodownEntry { @@ -65,16 +64,6 @@ private Double totalPrice;//总价 /** - * 供应商id - */ - private String supplierId; - - /** - * 供应商名称 - */ - private String supplierName; - - /** * 入库单 */ public static final String TYPE_IN ="入库单"; @@ -192,22 +181,6 @@ this.totalPrice = totalPrice; } - public String getSupplierId() { - return supplierId; - } - - public void setSupplierId(String supplierId) { - this.supplierId = supplierId; - } - - public String getSupplierName() { - return supplierName; - } - - public void setSupplierName(String supplierName) { - this.supplierName = supplierName; - } - public String getSubType() { return subType; } Index: ssts-web/src/main/webapp/WEB-INF/dwr.xml =================================================================== diff -u -r20772 -r20822 --- ssts-web/src/main/webapp/WEB-INF/dwr.xml (.../dwr.xml) (revision 20772) +++ ssts-web/src/main/webapp/WEB-INF/dwr.xml (.../dwr.xml) (revision 20822) @@ -571,6 +571,10 @@ + + + + Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java =================================================================== diff -u -r20812 -r20822 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java (.../ExpensiveGoodsGodownEntryAction.java) (revision 20812) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/action/ExpensiveGoodsGodownEntryAction.java (.../ExpensiveGoodsGodownEntryAction.java) (revision 20822) @@ -25,14 +25,10 @@ import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.BarcodeDevice; import com.forgon.disinfectsystem.barcode.service.BarcodeManager; -import com.forgon.disinfectsystem.common.CssdUtils; -import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsGodownEntry; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsGodownEntryItem; import com.forgon.disinfectsystem.entity.basedatamanager.barcodeinformation.BarcodeInformation; -import com.forgon.disinfectsystem.entity.tousseitem.TousseItem; import com.forgon.disinfectsystem.expensiveGoods.service.ExpensiveGoodsGodownEntryManager; -import com.forgon.disinfectsystem.expensiveGoods.service.ExpensiveGoodsManager; import com.forgon.tools.MapTools; import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.StrutsResponseUtils; @@ -61,8 +57,8 @@ } - public void setGodownEntryManager(ExpensiveGoodsGodownEntryManager godownEntryManager) { - this.expensiveGoodsGodownEntryManager = godownEntryManager; + public void setExpensiveGoodsGodownEntry(ExpensiveGoodsGodownEntryManager expensiveGoodsGodownEntryManager) { + this.expensiveGoodsGodownEntryManager = expensiveGoodsGodownEntryManager; } public void setGridManager(GridManager gridManager) { Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java =================================================================== diff -u -r20812 -r20822 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java (.../ExpensiveGoodsGodownEntryManagerImpl.java) (revision 20812) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/service/ExpensiveGoodsGodownEntryManagerImpl.java (.../ExpensiveGoodsGodownEntryManagerImpl.java) (revision 20822) @@ -4,11 +4,9 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -18,39 +16,28 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang3.ArrayUtils; import org.apache.log4j.Logger; import org.springframework.stereotype.Service; import com.forgon.Constants; -import com.forgon.directory.acegi.tools.AcegiHelper; import com.forgon.directory.model.OrgUnit; import com.forgon.directory.service.OrgUnitManager; import com.forgon.disinfectsystem.barcode.service.BarcodeManager; import com.forgon.disinfectsystem.basedatamanager.warehouse.service.WareHouseManager; -import com.forgon.disinfectsystem.common.CssdUtils; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsGodownEntry; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsGodownEntryItem; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsInstance; import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; -import com.forgon.disinfectsystem.expensiveGoods.util.ExpensiveGoodsUtils; import com.forgon.disinfectsystem.expensivegoods.ExpensiveGoodsServiceContext; -import com.forgon.disinfectsystem.inventorymanagement.constant.gdsy.ConstantDefinition; -import com.forgon.disinfectsystem.inventorymanagement.dao.WriteBackInventoryDao; -import com.forgon.disinfectsystem.inventorymanagement.service.WriteBackInventoryHelper; import com.forgon.disinfectsystem.vo.DisposableGoodsStorageAdjustVo; -import com.forgon.disinfectsystem.vo.GodownEntryItemPrintVO; -import com.forgon.log.model.Log; import com.forgon.log.service.LogManager; import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; import com.forgon.tools.date.DateTools; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.BasePoManagerImpl; -import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JSONUtil; -import com.forgon.tools.util.ForgonDateUtils; @Service("expensiveGoodsGodownEntryManagerTarget") public class ExpensiveGoodsGodownEntryManagerImpl extends BasePoManagerImpl implements ExpensiveGoodsGodownEntryManager { @@ -65,7 +52,7 @@ private ExpensiveGoodsManager expensiveGoodsManager; - private ExpensiveGoodsGodownEntryItemManager godownEntryItemManager; + private ExpensiveGoodsGodownEntryItemManager expensiveGoodsGodownEntryItemManager; private WareHouseManager wareHouseManager; @@ -83,9 +70,9 @@ this.expensiveGoodsManager = expensiveGoodsManager; } - public void setGodownEntryItemManager( - ExpensiveGoodsGodownEntryItemManager godownEntryItemManager) { - this.godownEntryItemManager = godownEntryItemManager; + public void setExpensiveGoodsGodownEntryItemManager( + ExpensiveGoodsGodownEntryItemManager expensiveGoodsGodownEntryItemManager) { + this.expensiveGoodsGodownEntryItemManager = expensiveGoodsGodownEntryItemManager; } public void setWareHouseManager(WareHouseManager wareHouseManager) { @@ -254,7 +241,7 @@ Long wareHouseId = entry.getWarehouseID(); String wareHouseName = entry.getWarehouseName(); for(ExpensiveGoodsGodownEntryItem item : entry.getItemsList()){ - godownEntryItemManager.setWareHouse(item, wareHouseId,wareHouseName); + expensiveGoodsGodownEntryItemManager.setWareHouse(item, wareHouseId,wareHouseName); } } } @@ -310,7 +297,6 @@ newEntry.setOperator(source.getOperator()); newEntry.setRemark(source.getRemark()); newEntry.setSerialNumber(serialNumManager.getSerialNumberStr(SerialNum.TYPE_INSERT_GODOWN)); - newEntry.setSupplierName(source.getSupplierName()); newEntry.setTime(source.getTime()); newEntry.setTotalPrice(source.getTotalPrice()); newEntry.setId(null); @@ -323,7 +309,7 @@ //设置item项 for(ExpensiveGoodsGodownEntryItem item : source.getItemsList()){ - ExpensiveGoodsGodownEntryItem newItem = godownEntryItemManager.clone(item); + ExpensiveGoodsGodownEntryItem newItem = expensiveGoodsGodownEntryItemManager.clone(item); newItem.setExpensiveGoodsEntry(newEntry); newItem.setId(null); newEntry.addItem(newItem); @@ -570,7 +556,7 @@ throw new IllegalArgumentException("entry和itemObject都不能为空"); } - ExpensiveGoodsGodownEntryItem godownEntryItem = godownEntryItemManager.parseGodownEntryItem(itemObject); + ExpensiveGoodsGodownEntryItem godownEntryItem = expensiveGoodsGodownEntryItemManager.parseGodownEntryItem(itemObject); godownEntryItem.setExpensiveGoodsEntry(entry); entry.getItemsList().add(godownEntryItem); } Index: ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsGodownEntryTableManager.java =================================================================== diff -u -r20812 -r20822 --- ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsGodownEntryTableManager.java (.../ExpensiveGoodsGodownEntryTableManager.java) (revision 20812) +++ ssts-expensivegoods/src/main/java/com/forgon/disinfectsystem/expensiveGoods/dwr/table/ExpensiveGoodsGodownEntryTableManager.java (.../ExpensiveGoodsGodownEntryTableManager.java) (revision 20822) @@ -7,30 +7,15 @@ import com.forgon.component.grid.GridManager; import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsGodownEntry; -import com.forgon.disinfectsystem.expensiveGoods.service.ExpensiveGoodsGodownEntryItemManager; -import com.forgon.disinfectsystem.expensiveGoods.service.ExpensiveGoodsGodownEntryManager; -//@Service public class ExpensiveGoodsGodownEntryTableManager { private GridManager gridManager; - private ExpensiveGoodsGodownEntryItemManager expensiveGoodsGodownEntryItemManager; - - private ExpensiveGoodsGodownEntryManager expensiveGoodsGodownEntryManager; - public void setGridManager(GridManager gridManager) { this.gridManager = gridManager; } - public void setGodownEntryItemManager( - ExpensiveGoodsGodownEntryItemManager godownEntryItemManager) { - this.expensiveGoodsGodownEntryItemManager = godownEntryItemManager; - } - public void setGodownEntryManager(ExpensiveGoodsGodownEntryManager godownEntryManager) { - this.expensiveGoodsGodownEntryManager = godownEntryManager; - } - /** * 入库单(自购入库或预入库) * Index: ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml =================================================================== diff -u -r20820 -r20822 --- ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 20820) +++ ssts-web/src/main/resources/spring/applicationContext-disinfectsystem-service.xml (.../applicationContext-disinfectsystem-service.xml) (revision 20822) @@ -1231,6 +1231,18 @@ + + + + + + + + + + + +