Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java =================================================================== diff -u -r16348 -r18730 --- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java (.../GodownEntryManagerImpl.java) (revision 16348) +++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/GodownEntryManagerImpl.java (.../GodownEntryManagerImpl.java) (revision 18730) @@ -1,6 +1,5 @@ package com.forgon.disinfectsystem.diposablegoods.service; -import java.io.PrintWriter; import java.text.ParseException; import java.util.ArrayList; import java.util.Collection; @@ -13,8 +12,6 @@ import java.util.Map; import java.util.Set; -import javax.servlet.http.HttpServletResponse; - import net.sf.json.JSONArray; import net.sf.json.JSONObject; @@ -48,15 +45,12 @@ import com.forgon.disinfectsystem.entity.assestmanagement.GodownEntryWB; import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem; -import com.forgon.disinfectsystem.entity.invoicemanager.Invoice; -import com.forgon.disinfectsystem.entity.invoicemanager.InvoiceItem; import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecordDiposableGoodsItem; import com.forgon.disinfectsystem.inventorymanagement.dao.WriteBackInventoryDao; import com.forgon.disinfectsystem.inventorymanagement.service.WriteBackInventoryHelper; import com.forgon.disinfectsystem.vo.GodownEntryItemPrintVO; import com.forgon.serialnumber.model.SerialNum; import com.forgon.serialnumber.service.SerialNumManager; -import com.forgon.tools.StrutsParamUtils; import com.forgon.tools.db.DatabaseUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JSONUtil; @@ -160,6 +154,7 @@ this.barcodeManager = barcodeManager; } + @Override public GodownEntry getGodownEntryById(String id) { return (GodownEntry) objectDao.getByProperty( GodownEntry.class.getSimpleName(), "id", Long.valueOf(id)); @@ -181,9 +176,11 @@ objectDao.delete(godownEntry); } + @Override public Map deleteGodownEntryById_TRANS_NEW(String id) { return deleteGodownEntryById_internal(id); } + @Override public Map deleteGodownOutEntryById_TRANS_NEW(String id) { return deleteGodownEntryOutById_internal(id); } @@ -349,25 +346,30 @@ return null; } + @Override public void saveGodownEntry_TRANS_REQUIRED(GodownEntry entry, Map result) { saveGodownEntry_internal(entry, result); } // 保存入库单,只修改库存，不改其他属性，用于盘点与调拨 + @Override public void saveGodownEntryModifyOnlyAmount_TRANS_REQUIRED(GodownEntry entry,Map result){ saveGodownEntryModifyOnlyAmount_internal(entry, result); } + @Override public void saveGodownEntry_TRANS_MANDATORY(GodownEntry entry, Map result) { saveGodownEntry_internal(entry, result); } + @Override public void saveGodownEntry_TRANS_REQUIRED(Collection entrys, Map result) { saveGodownEntry_internal(entrys, result); } + @Override public void saveGodownEntry_TRANS_MANDATORY(Collection entrys, Map result) { saveGodownEntry_internal(entrys, result); @@ -845,6 +847,7 @@ objectDao.save(entry); } + @Override public void updateGodownEntry_TRANS_REQUIRED(GodownEntry original, GodownEntry entry, Map result) { updateGodownEntry_internal(original, entry, result); @@ -1325,7 +1328,7 @@ if (StringUtils.isNotBlank(batchStockIDsStr)) { String batchStockSql = String.format(" where %s ", SqlUtils.getStringFieldInCollectionsPredicate("po.id", disposableGoodsBatchStockIDsSet)); - batchStocks = (List) objectDao.findBySql( + batchStocks = objectDao.findBySql( DisposableGoodsBatchStock.class.getSimpleName(), batchStockSql); } @@ -1341,7 +1344,7 @@ } String getIdentificationSql = String.format(" where %s ", SqlUtils.getNonStringFieldInCollectionsPredicate("po.id", identificationIdsSet)); - List identifications = (List) objectDao + List identifications = objectDao .findBySql(DisposableGoodsIdentification.class.getSimpleName(), getIdentificationSql); @@ -1526,13 +1529,15 @@ } // 保存退库单 + @Override public void saveGodownOutEntry_TRANS_REQUIRED(GodownEntry entry, Map result , boolean needWriteBack) { saveGodownOutEntry_internal(entry, result , needWriteBack); } /** * */ + @Override public void saveAppropriateEntry_TRANS_REQUIRED(GodownEntry entry,Map result){ if(entry != null){ entry.setId(null); @@ -1655,22 +1660,26 @@ this.syncGodownEntryWareHouse(newEntry); return newEntry; } + @Override public void saveGodownOutEntry_TRANS_NEW(GodownEntry entry,Map result){ saveGodownOutEntry_internal(entry, result , true); } + @Override public void saveGodownOutEntry_TRANS_MANDATORY(GodownEntry entry, Map result) { boolean needWriteBack = true; saveGodownOutEntry_internal(entry, result , needWriteBack); } + @Override public void saveGodownOutEntry_TRANS_REQUIRED(Collection entrys, Map result) { //手工添加退库单,暂定需要回写 boolean needWriteBack = true; saveGodownOutEntry_internal(entrys, result ,needWriteBack); } + @Override public void saveGodownOutEntry_TRANS_MANDATORY( Collection entrys, Map result) { //手工添加退库单,暂定需要回写 @@ -1684,6 +1693,7 @@ * @param entrys * @param result */ + @Override public void saveGodownOutEntryWithoutWriteBack_TRANS_MANDATORY( Iterable entrys, Map result) { //同步退库单不需要回写 @@ -2266,10 +2276,12 @@ } } // 更新退库单 + @Override public void updateGodownOutEntry_TRANS_REQUIRED(GodownEntry original, GodownEntry entry, Map result) { updateGodownOutEntry_internal(original, entry, result); } + @Override public void updateGodownOutEntry_TRANS_MANDATORY(GodownEntry original, GodownEntry entry, Map result) { updateGodownOutEntry_internal(original, entry, result); @@ -2448,6 +2460,7 @@ return voList; } // 获取入库单打印信息 + @Override public void loadGodownEntryPrintData( String[] invoiceIds,JSONObject jsonObject) { Collection tousseList = CollectionUtils.emptyCollection(); @@ -2470,6 +2483,7 @@ String warehouseName = ""; String targetWarehouseName = ""; String subType = ""; + String remark = ""; if(list.size() == 1){ GodownEntry godownEntry = list.get(0); serialNumber = godownEntry.getSerialNumber(); @@ -2478,6 +2492,7 @@ warehouseName = godownEntry.getWarehouseName(); targetWarehouseName = godownEntry.getTargetWareHouseName(); subType = godownEntry.getSubType(); + remark = godownEntry.getRemark(); } jsonObject.put("serialNumber", serialNumber); jsonObject.put("applicant", applicant); @@ -2486,6 +2501,7 @@ jsonObject.put("warehouseName", warehouseName); jsonObject.put("targetWarehouseName", targetWarehouseName); jsonObject.put("subType", subType); + jsonObject.put("remark", remark); tousseList = loadToussePrintData(list); jsonObject.put("goods", tousseList); @@ -2592,6 +2608,7 @@ } } + @Override public void printSomeGodownEntryItem(String items,JSONObject jsonObj){ JSONArray jsonArray = new JSONArray(); jsonObj.put("success", true); Index: ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js =================================================================== diff -u -r16954 -r18730 --- ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js (.../printConfig.js) (revision 16954) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzfdzl/print/printConfig.js (.../printConfig.js) (revision 18730) @@ -447,6 +447,7 @@ {label : "小计: ", dataIndex : 'totalPrice', fontSize : 9, position : ["7.5cm","2%","90%",4]}, + {label : "备注:", dataIndex : 'remark', fontSize : 9, position : ["7.5cm","25%","90%",4]}, {label : "制单日期:", dataIndex : 'printTime', fontSize : 9, position : ["8cm","2%","90%",4]}, {label : "制单人:", dataIndex : 'printUser', fontSize : 9, position : ["8cm","25%","90%",4]}, //{label : "验收:", dataIndex : '', fontSize : 9, position : ["8cm","38%","90%",4]}, @@ -486,6 +487,7 @@ {label : "退库单号：", dataIndex : 'serialNumber', fontSize : 9, position : ["1cm","75%","90%",5]}, {label : "小计: ", dataIndex : 'totalPrice', fontSize : 9, position : ["7.5cm","2%","90%",4]}, + {label : "备注:", dataIndex : 'remark', fontSize : 9, position : ["7.5cm","25%","90%",4]}, {label : "制单日期:", dataIndex : 'printTime', fontSize : 9, position : ["8cm","2%","90%",4]}, {label : "制单人:", dataIndex : 'printUser', fontSize : 9, position : ["8cm","25%","90%",4]}, //{label : "验收:", dataIndex : '', fontSize : 9, position : ["8cm","38%","90%",4]}, @@ -524,6 +526,7 @@ {label : "入库单号：", dataIndex : 'serialNumber', fontSize : 9, position : ["1cm","75%","90%",5]}, {label : "小计: ", dataIndex : 'totalPrice', fontSize : 9, position : ["7.5cm","2%","90%",4]}, + {label : "备注:", dataIndex : 'remark', fontSize : 9, position : ["7.5cm","25%","90%",4]}, {label : "制单日期:", dataIndex : 'printTime', fontSize : 9, position : ["8cm","2%","90%",4]}, {label : "制单人:", dataIndex : 'printUser', fontSize : 9, position : ["8cm","25%","90%",4]}, {label : "验收:", dataIndex : '', fontSize : 9, position : ["8cm","38%","90%",4]}, @@ -618,6 +621,7 @@ {label : "入库单号：", dataIndex : 'serialNumber', fontSize : 9, position : ["1cm","75%","90%",5]}, {label : "小计: ", dataIndex : 'totalPrice', fontSize : 9, position : ["7.5cm","2%","90%",4]}, + {label : "备注:", dataIndex : 'remark', fontSize : 9, position : ["7.5cm","25%","90%",4]}, // {label : "", dataIndex : 'totalPrice', fontSize : 11, position : ["8cm","60%","90%",4]}, {label : "制单日期:", dataIndex : 'printTime', fontSize : 9, position : ["8cm","2%","90%",4]}, {label : "制单人:", dataIndex : 'printUser', fontSize : 9, position : ["8cm","25%","90%",4]}, Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java =================================================================== diff -u -r18482 -r18730 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java (.../MaterialEntryManagerImpl.java) (revision 18482) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/materialmanager/service/MaterialEntryManagerImpl.java (.../MaterialEntryManagerImpl.java) (revision 18730) @@ -482,12 +482,14 @@ String supplierName = "";//供应商 String warehouseName = ""; String targetWarehouseName = ""; + String remark = ""; if(list.size() == 1){ MaterialEntry materialEntry = list.get(0); serialNumber = materialEntry.getSerialNumber(); time = ForgonDateUtils.safelyFormatDate(materialEntry.getTime(), Constants.DATEFORMAT_YYYYMMDD, ""); //supplierName = materialEntry.getSupplierName(); warehouseName = materialEntry.getWareHouseName(); + remark = materialEntry.getRemark(); for(MaterialEntryItem item : materialEntry.getItemsList()){ if(StringTools.isEmpty(supplierName)){ supplierName = item.getSupplierName(); @@ -511,6 +513,7 @@ jsonObject.put("supplierName", supplierName); jsonObject.put("warehouseName", warehouseName); jsonObject.put("targetWarehouseName", targetWarehouseName); + jsonObject.put("remark", remark); jsonObject.put("goods", materialItemArray); }