Merge branch 'yanyang' of http://git.picaiba.com/CaiXiang/cigs4
# Conflicts: # ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxServiceBiz.java # ym-packing/src/main/java/com/cnbm/packing/service/WoPackagingBoxSubstrateServiceBiz.java # ym-packing/src/main/java/com/cnbm/packing/service/impl/WoPackagingBoxServiceBizImpl.java
This commit is contained in:
		| @@ -4,7 +4,6 @@ import com.cnbm.common.page.PageData; | ||||
| import com.cnbm.common.service.CrudService; | ||||
| import com.cnbm.packing.dto.WoPackagingBoxSubstrateDTO; | ||||
| import com.cnbm.packing.entity.WoPackagingBoxSubstrate; | ||||
| import org.apache.ibatis.annotations.Param; | ||||
|  | ||||
| import java.util.Map; | ||||
|  | ||||
| @@ -28,10 +27,12 @@ public interface WoPackagingBoxSubstrateServiceBiz extends CrudService<WoPackagi | ||||
|  | ||||
|     void removeSubstrate(Long id); | ||||
|  | ||||
|     void insertSubstrate(WoPackagingBoxSubstrateDTO dto); | ||||
|     void insertSubstrate(ChangePackingBoxDTO dto); | ||||
|  | ||||
|     void replaceSubstrate(WoPackagingBoxSubstrateDTO[] dtos); | ||||
|     void replaceSubstrate(ChangePackingBoxDTO[] dtos); | ||||
|  | ||||
|     void insertSubstrateManual(ChangePackingBoxDTO dto); | ||||
|      | ||||
|     void batchInsert(WoPackagingBoxSubstrateDTO[] lists); | ||||
|  | ||||
|     WoPackagingBoxSubstrate getBySubId(String subId); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user