Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java =================================================================== diff -u -r12553 -r12582 --- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java (.../WriteBackInventoryManagerImpl.java) (revision 12553) +++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/inventorymanagement/service/WriteBackInventoryManagerImpl.java (.../WriteBackInventoryManagerImpl.java) (revision 12582) @@ -1,13 +1,5 @@ package com.forgon.disinfectsystem.inventorymanagement.service; -import static org.apache.ibatis.jdbc.SqlBuilder.BEGIN; -import static org.apache.ibatis.jdbc.SqlBuilder.FROM; -import static org.apache.ibatis.jdbc.SqlBuilder.GROUP_BY; -import static org.apache.ibatis.jdbc.SqlBuilder.JOIN; -import static org.apache.ibatis.jdbc.SqlBuilder.SELECT; -import static org.apache.ibatis.jdbc.SqlBuilder.SQL; -import static org.apache.ibatis.jdbc.SqlBuilder.WHERE; - import java.sql.ResultSet; import java.sql.SQLException; import java.util.ArrayList; @@ -20,7 +12,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang3.text.StrBuilder; import org.apache.commons.lang3.time.DateUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; @@ -118,6 +109,7 @@ } entry.setDepartCoding(invoice.getInvoicePlan() .getSettleAccountsDepartCoding()); + if(StringUtils.isNotBlank(invoice.getInvoicePlan().getProjCode())){ entry.setProjCode(invoice.getInvoicePlan().getProjCode());//设置项目编码 } @@ -172,7 +164,7 @@ return entry.getId(); } catch(RuntimeException ex){ - logger.error(String.format("回写发货单%s失败", invoice.getSerialNumber())); + logger.error(String.format("回写发货单%s失败", invoice.getSerialNumber()) + ",失败原因" + ex.getMessage()); throw ex; } } Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/StorageEntry.java =================================================================== diff -u -r12553 -r12582 --- ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/StorageEntry.java (.../StorageEntry.java) (revision 12553) +++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/StorageEntry.java (.../StorageEntry.java) (revision 12582) @@ -44,6 +44,7 @@ public void setStoreName(String storeName) { this.storeName = storeName; } + public Collection getItems() { return items; } Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/WriteBackEntry.java =================================================================== diff -u -r12553 -r12582 --- ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/WriteBackEntry.java (.../WriteBackEntry.java) (revision 12553) +++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/inventorymanagement/model/WriteBackEntry.java (.../WriteBackEntry.java) (revision 12582) @@ -98,6 +98,7 @@ public void setProjCode(String projCode) { this.projCode = projCode; } + public Collection getItems() { return items; }