Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r16383 -r16437 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 16383) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 16437) @@ -1122,6 +1122,7 @@ task.setRecyclingBasketName(basketName); task.setBasketBarcode(basketBarcode); task.setDepartment(recyclingRecord.getDepart()); + task.setDepartCoding(recyclingRecord.getDepartCode()); packingManager.saveOrUpdate(task); //标识牌处理 Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r16433 -r16437 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 16433) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 16437) @@ -19,7 +19,7 @@ "3.3.0","3.3.8", "3.3.9", "3.3.10","3.3.12","3.3.13","3.8.0","3.9.0","3.9.1","3.9.2","4.0.2","4.0.3","4.0.4", "4.0.5","4.0.6","4.0.44","4.0.45","4.1.0","4.1.1","4.1.2","4.1.3","4.1.4","4.1.5","4.1.6","4.1.7","4.1.8","4.1.9","4.2.0","4.2.1","4.2.2", "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9", - "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4","4.5.5","4.5.6"};// 版本列表 + "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4","4.5.5","4.5.6","4.5.7"};// 版本列表 public final static List SOFTWARE_VERSION_LIST = Arrays .asList(SOFTWARE_VERSION_ARRAY); public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本 Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.5.6_4.5.7.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.5.6_4.5.7.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.5.6_4.5.7.sql (revision 16437) @@ -0,0 +1,3 @@ +update packingtask set departcoding = (select p.departcoding from invoiceplan p where p.id = packingtask.sourceid) where tasktype = 0; +update packingtask set departcoding = (select p.departCode from recyclingrecord p where p.id = packingtask.sourceid) where tasktype = 1; +update packingtask set departcoding = (select p.departCoding from returnGoodsRecord p where p.id = packingtask.sourceid) where tasktype = 2; \ No newline at end of file