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:
@@ -5,7 +5,6 @@ import com.cnbm.common.service.CrudService;
|
||||
import com.cnbm.packing.dto.WoPackagingBoxDTO;
|
||||
import com.cnbm.packing.dto.WoPackagingBoxDTO;
|
||||
import com.cnbm.packing.entity.WoPackagingBox;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@@ -30,5 +29,8 @@ public interface WoPackagingBoxServiceBiz extends CrudService<WoPackagingBox, Wo
|
||||
|
||||
List<WoPackagingBoxDTO> list();
|
||||
|
||||
WoPackagingBoxDTO printList(Long id);
|
||||
|
||||
|
||||
int updateIsArrivedByBoxNo(Integer isArrived, String boxNo);
|
||||
}
|
||||
Reference in New Issue
Block a user