Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java =================================================================== diff -u -r33081 -r33817 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java (.../TousseItemVo.java) (revision 33081) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseItemVo.java (.../TousseItemVo.java) (revision 33817) @@ -176,7 +176,10 @@ * 汇总时间 */ private Date summaryTime; - + /** + * 物品申领备注 + */ + private String remarkOfApplyGoods; @Override public String toString() { return "{\"id\":\"" + id + "\", \"ancestorId\":\"" + ancestorId @@ -665,5 +668,13 @@ public void setSummaryTime(Date summaryTime) { this.summaryTime = summaryTime; } + + public String getRemarkOfApplyGoods() { + return remarkOfApplyGoods; + } + + public void setRemarkOfApplyGoods(String remarkOfApplyGoods) { + this.remarkOfApplyGoods = remarkOfApplyGoods; + } } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java =================================================================== diff -u -r32420 -r33817 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java (.../WaitPackingTaskItemVo.java) (revision 32420) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskItemVo.java (.../WaitPackingTaskItemVo.java) (revision 33817) @@ -91,6 +91,10 @@ */ private String recyclingItemRemark; /** + * 申请项备注信息 + */ + private String remarkOfApplyGoods; + /** * 加急等级 */ private String urgentLevel; @@ -608,6 +612,14 @@ public void setPrintBOMwhenPrintLabel(String printBOMwhenPrintLabel) { this.printBOMwhenPrintLabel = printBOMwhenPrintLabel; } + + public String getRemarkOfApplyGoods() { + return remarkOfApplyGoods; + } + + public void setRemarkOfApplyGoods(String remarkOfApplyGoods) { + this.remarkOfApplyGoods = remarkOfApplyGoods; + } } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r33788 -r33817 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 33788) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 33817) @@ -1642,6 +1642,7 @@ } } } + itemVo.setRemarkOfApplyGoods(task.getRemarkOfApplyGoods()); itemVo.setTaskId(task.getId()); itemVo.setWashRecordId(task.getWashRecord_id()); itemVo.setSerialNumber(serialNumManager.variablePart(serialNum, task.getSerialNumber())); @@ -1823,6 +1824,9 @@ vo.setUrgentAmount(urgentAmount + task.getUrgentAmount()); } } + if(!vo.getHaveRemarkOfApplyGoods() && StringUtils.isNotBlank(task.getRemarkOfApplyGoods())){ + vo.setHaveRemarkOfApplyGoods(true); + } String note = td.getNote(); if(StringUtils.isNotBlank(note)){ vo.setNote(note); @@ -2221,7 +2225,7 @@ extraOrder = " ul.grade desc,"; sql = "select distinct "+ selectRecyclingUserSql +"td.needInspectMaterials,td.printBOMwhenPrintLabel,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.urgentLevel,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,idn.idNumber," + "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,td.packageSize," - + "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,hidePackingTask" + + "po.remarkOfApplyGoods,td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,hidePackingTask" + " ,ul.id urgentLevelId,ul.name urgentLevelName,ul.colorCode,ul.grade " + " from PackingTask po " //+ ", CssdHandleTousses ct , TousseDefinition td " @@ -2243,7 +2247,7 @@ extraOrder = " po.urgentAmount desc, "; sql = "select distinct "+ selectRecyclingUserSql +"td.needInspectMaterials,td.printBOMwhenPrintLabel,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.urgentLevel,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,idn.idNumber," + "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,td.packageSize," - + "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,hidePackingTask " + + "po.remarkOfApplyGoods,td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,hidePackingTask " + "from PackingTask po " + " inner join TousseDefinition td on po.tousseDefinition_id = td.id " + " inner join CssdHandleTousses ct on ct.tousseDefinitionId=td.ancestorID " @@ -2340,7 +2344,7 @@ } String sql = "select "+ selectRecyclingUserSql +"td.needInspectMaterials,td.printBOMwhenPrintLabel,po.classifyBasket_id,po.classifyBasketIds,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber,po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,idn.idNumber," + "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,td.packageSize," - + "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,urgentLevel,hidePackingTask " + + "po.remarkOfApplyGoods,td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,urgentLevel,hidePackingTask " + urgentlevelQuery + " from PackingTask po " + " inner join TousseDefinition td on po.tousseDefinition_id = td.id " @@ -2416,7 +2420,7 @@ } String sql = "select "+ selectRecyclingUserSql +"td.needInspectMaterials,td.printBOMwhenPrintLabel,po.washRecord_id,po.sourceId, po.recyclingItemRemark,po.serialNumber, po.errorRemark,po.damageRemark, po.id as taskId,recyclingBasketName,basketBarcode,department,po.status,washTime,startTime,unPackAmount,taskType,idCardBarcode,idn.idNumber," + "td.id as tousseDefinitionId,td.invoicePlanID,td.name,td.allowModifyPackageType,td.isDisableIDCard,td.tousseType,td.packagetype,td.sterilingMethod,td.isTraceable,td.packageSize," - + "td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,urgentLevel,hidePackingTask " + + "po.remarkOfApplyGoods,td.isPrint,td.isReview,td.note,td.uuid_vedioNames,td.isUploadVideo,td.supplierName,urgentAmount,urgentLevel,hidePackingTask " + "from PackingTask po " + " inner join TousseDefinition td on po.tousseDefinition_id = td.id " + " left join IDCardInfoForPackingTask ifp on ifp.packingTaskID=po.id " @@ -2526,7 +2530,7 @@ } task.setSerialNumber(rs.getString("serialNumber")); task.setRecyclingItemRemark(rs.getString("recyclingItemRemark")); - + task.setRemarkOfApplyGoods(rs.getString("remarkOfApplyGoods")); TousseDefinition td = new TousseDefinition(); BigDecimal tousseDefinitionIdBigDecimal = (BigDecimal)rs.getObject("tousseDefinitionId"); td.setId(tousseDefinitionIdBigDecimal == null ? null : tousseDefinitionIdBigDecimal.longValue()); @@ -2556,6 +2560,7 @@ } }catch(Exception e){ logger.error("查询待装配装配任务集合失败:" + e); + e.printStackTrace(); }finally{ DatabaseUtil.closeResultSetAndStatement(rs); } Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java =================================================================== diff -u -r31988 -r33817 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java (.../WaitPackingTaskVo.java) (revision 31988) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/vo/WaitPackingTaskVo.java (.../WaitPackingTaskVo.java) (revision 33817) @@ -100,6 +100,10 @@ * 装配时需要检查材料 */ private Boolean needInspectMaterials = false; + /** + * 有申请备注 + */ + private boolean haveRemarkOfApplyGoods = false; public String getTousseName() { return tousseName; } @@ -378,5 +382,13 @@ public void setNeedInspectMaterials(Boolean needInspectMaterials) { this.needInspectMaterials = needInspectMaterials; } + + public boolean getHaveRemarkOfApplyGoods() { + return haveRemarkOfApplyGoods; + } + + public void setHaveRemarkOfApplyGoods(boolean haveRemarkOfApplyGoods) { + this.haveRemarkOfApplyGoods = haveRemarkOfApplyGoods; + } } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java =================================================================== diff -u -r32795 -r33817 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java (.../PackingTask.java) (revision 32795) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java (.../PackingTask.java) (revision 33817) @@ -209,6 +209,10 @@ */ private String recyclingItemRemark; /** + * 申请项备注 + */ + private String remarkOfApplyGoods; + /** * 加急等级 */ private String urgentLevel; @@ -665,6 +669,12 @@ public void setIdNumber(String idNumber) { this.idNumber = idNumber; } - - + + public String getRemarkOfApplyGoods() { + return remarkOfApplyGoods; + } + + public void setRemarkOfApplyGoods(String remarkOfApplyGoods) { + this.remarkOfApplyGoods = remarkOfApplyGoods; + } } Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r33804 -r33817 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 33804) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 33817) @@ -3550,6 +3550,9 @@ task.setErrorRemark(ri == null?"":ri.getErrorRemark()); task.setDamageRemark(ri == null?"":ri.getDamageRemark()); task.setRecyclingItemRemark(ri==null?"":ri.getRemark()); + if(tousseItem != null){ + task.setRemarkOfApplyGoods(tousseItem.getRemarkOfApplyGoods()); + } Integer urgentAmountOfMap = null;//剩余加急装配任务数量 if(recyclingItemAndAmountMap.containsKey(ri.getId())){ urgentAmountOfMap = recyclingItemAndAmountMap.get(ri.getId());